use standard formatting for Override annotation

52 files changed, 242 insertions, 121 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java
index 7f88cfd2a9b..224fa8e92fc 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java
@@ -87,6 +87,7 @@ public class TermType {
         return name.hashCode();
     }
 
-    public @Override String toString() { return "term type '" + name + "'"; }
+    @Override
+    public String toString() { return "term type '" + name + "'"; }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
index a89231b30ae..29b4bce1046 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
@@ -93,10 +93,12 @@ public class WordItem extends TermItem {
      * Returns this word as it should be used in executing the query.
      * This is usually (but not always) a normalized and stemmed form
      */
-    public @Override String stringValue() { return word; }
+    @Override
+    public String stringValue() { return word; }
 
     /** Same as #setWord */
-    public @Override void setValue(String value) { setWord(value); }
+    @Override
+    public void setValue(String value) { setWord(value); }
 
     /**
      * Get the word exactly as received in the request.
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
index 86fdee2bad9..12a904a29e2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
@@ -389,7 +389,8 @@ public class PhraseMatcher {
 
             public int getLength() { return 1; }
 
-            public @Override TermItem getItem(int index) {
+            @Override
+            public TermItem getItem(int index) {
                 if (index!=0) throw new IndexOutOfBoundsException("No word at " + index + " in " + this);
                 return item;
             }
@@ -455,7 +456,8 @@ public class PhraseMatcher {
                 return startIndex==0 && length==owner.getItemCount();
             }
 
-            public @Override TermItem getItem(int index) {
+            @Override
+            public TermItem getItem(int index) {
                 adjustIfBackingChanged();
                 return (TermItem)owner.getItem(startIndex+index);
             }
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java
index ac2196bb9f5..2baa4698145 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java
@@ -26,7 +26,8 @@ public class MultipleResultsSearcher extends Searcher {
     private static final CompoundName maxTimesRetrieveHeterogeneousHitsName=new CompoundName(propertyPrefix + "maxTimesRetrieveHeterogeneousHits");
     private static final CompoundName numHits=new CompoundName(propertyPrefix + "numHits");
 
-    public @Override Result search(Query query, Execution e) {
+    @Override
+    public Result search(Query query, Execution e) {
         try {
             Parameters parameters = new Parameters(query);
 
diff --git a/container-search/src/main/java/com/yahoo/search/Searcher.java b/container-search/src/main/java/com/yahoo/search/Searcher.java
index 69025271430..cf41b01144e 100644
--- a/container-search/src/main/java/com/yahoo/search/Searcher.java
+++ b/container-search/src/main/java/com/yahoo/search/Searcher.java
@@ -174,7 +174,8 @@ public abstract class Searcher extends Processor {
     protected Logger getLogger() { return logger; }
 
     /** Returns "searcher 'getId()'" */
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return "searcher '" + getIdString() + "'";
 
     }
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
index f660f39656d..527d44b16ca 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
@@ -313,7 +313,8 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         getLogger().log(level, sb.toString());
     }
 
-    public @Override void deconstruct() {
+    @Override
+    public void deconstruct() {
         super.deconstruct();
         monitor.shutdown();
     }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
index 66bb678e983..594481b667d 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
@@ -29,7 +29,8 @@ public abstract class ConfiguredHTTPClientSearcher extends HTTPClientSearcher {
     }
 
     /** Forwards to the next in chain fill(result,summaryName) */
-    public @Override void fill(Result result,String summaryName, Execution execution,Connection connection) {
+    @Override
+    public void fill(Result result,String summaryName, Execution execution,Connection connection) {
         execution.fill(result,summaryName);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
index 25253f768bd..8e3225703f6 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
@@ -62,7 +62,8 @@ public abstract class ConfiguredHTTPProviderSearcher extends HTTPProviderSearche
      * Override this to provider multi-phase result filling towards a backend.
      * This default implementation does nothing.
      */
-    public @Override void fill(Result result,String summaryName, Execution execution,Connection connection) {
+    @Override
+    public void fill(Result result,String summaryName, Execution execution,Connection connection) {
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java b/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java
index 25962090a69..bdf0caaac6d 100644
--- a/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java
+++ b/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java
@@ -25,15 +25,18 @@ public class Intent {
     /** Returns the id of this intent, never null */
     public String getId() { return id; }
 
-    public @Override int hashCode() { return id.hashCode(); }
+    @Override
+    public int hashCode() { return id.hashCode(); }
 
-    public @Override boolean equals(Object other) {
+    @Override
+    public boolean equals(Object other) {
         if (other==this) return true;
         if ( ! (other instanceof Intent)) return false;
         return this.id.equals(((Intent)other).id);
     }
 
     /** Returns the id of this intent */
-    public @Override String toString() { return id; }
+    @Override
+    public String toString() { return id; }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java
index 113bad46312..345c041d212 100644
--- a/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java
+++ b/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java
@@ -22,7 +22,8 @@ public class IntentNode extends ParentNode<SourceNode> {
     public void setIntent(Intent intent) { this.intent=intent; }
 
     /** Returns intent:probability */
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return intent + ":" + getScore();
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java
index d54025bb0c6..9101d977e16 100644
--- a/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java
+++ b/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java
@@ -28,7 +28,8 @@ public class InterpretationNode extends ParentNode<IntentNode> {
     }
 
     /** Returns the probability of the interpretation of this */
-    public @Override double getScore() {
+    @Override
+    public double getScore() {
         return interpretation.getProbability();
     }
 
@@ -38,7 +39,8 @@ public class InterpretationNode extends ParentNode<IntentNode> {
     }
 
     /** Returns interpretations toString() */
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return interpretation.toString();
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Source.java b/container-search/src/main/java/com/yahoo/search/intent/model/Source.java
index f224612f23f..cd6b8cca28d 100644
--- a/container-search/src/main/java/com/yahoo/search/intent/model/Source.java
+++ b/container-search/src/main/java/com/yahoo/search/intent/model/Source.java
@@ -23,15 +23,18 @@ public class Source {
     /** Returns the id of this source, never null */
     public String getId() { return id; }
 
-    public @Override int hashCode() { return id.hashCode(); }
+    @Override
+    public int hashCode() { return id.hashCode(); }
 
-    public @Override boolean equals(Object other) {
+    @Override
+    public boolean equals(Object other) {
         if (other==this) return true;
         if ( ! (other instanceof Source)) return false;
         return this.id.equals(((Source)other).id);
     }
 
     /** Returns the id of this source */
-    public @Override String toString() { return id; }
+    @Override
+    public String toString() { return id; }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java
index 84c98b8c723..4fcf93809ef 100644
--- a/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java
+++ b/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java
@@ -34,7 +34,8 @@ public class SourceNode extends Node {
     }
 
     /** Returns source:appropriateness */
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return source + ":" + getScore();
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
index 8c421feae47..915b44ce5e0 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
@@ -49,7 +49,8 @@ public final class PageTemplate extends FreezableComponent implements PageElemen
         return Collections.unmodifiableSet(sourceVisitor.getSources());
     }
 
-    public @Override void freeze() {
+    @Override
+    public void freeze() {
         if (isFrozen()) return;
         resolvePlaceholders();
         section.freeze();
@@ -70,12 +71,14 @@ public final class PageTemplate extends FreezableComponent implements PageElemen
     }
 
     /** Accepts a visitor to this structure */
-    public @Override void accept(PageTemplateVisitor visitor) {
+    @Override
+    public void accept(PageTemplateVisitor visitor) {
         visitor.visit(this);
         section.accept(visitor);
     }
 
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return "page template '" + getId() + "'";
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
index de19e8ab747..8dcfde01d20 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
@@ -21,7 +21,8 @@ class PlaceholderMappingVisitor extends PageTemplateVisitor {
 
     private Map<String, MapChoice> placeholderIdToChoice=new LinkedHashMap<>();
 
-    public @Override void visit(MapChoice mapChoice) {
+    @Override
+    public void visit(MapChoice mapChoice) {
         List<String> placeholderIds=mapChoice.placeholderIds();
         for (String placeholderId : placeholderIds) {
             MapChoice existingChoice=placeholderIdToChoice.put(placeholderId,mapChoice);
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java
index c464dd3dedc..8f1413c8c63 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java
@@ -20,7 +20,8 @@ class PlaceholderReferenceCreatingVisitor extends PageTemplateVisitor {
         this.placeholderIdToChoice=placeholderIdToChoice;
     }
 
-    public @Override void visit(Placeholder placeholder) {
+    @Override
+    public void visit(Placeholder placeholder) {
         MapChoice choice=placeholderIdToChoice.get(placeholder.getId());
         if (choice==null)
             throw new IllegalArgumentException(placeholder + " is not referenced by any choice");
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java
index 5349d9f2aaa..2ae95dc97d1 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java
@@ -19,7 +19,8 @@ class RelevanceComparator extends ChainableComparator {
         super(secondaryComparator);
     }
 
-    public @Override int compare(Hit h1,Hit h2) {
+    @Override
+    public int compare(Hit h1,Hit h2) {
         int relevanceComparison=h2.getRelevance().compareTo(h1.getRelevance());
         if (relevanceComparison!=0) return relevanceComparison;
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java
index 3ee3e3aeef0..6cfe8be50d3 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java
@@ -59,7 +59,8 @@ public class Resolution {
         return resolution;
     }
 
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return "a resolution of " + choiceResolutions.size() + " choices";
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
index 6415dad37ec..1bb46ac14a6 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
@@ -98,12 +98,14 @@ public abstract class Resolver extends AbstractComponent {
             this.resolution=resolution;
         }
 
-        public @Override void visit(Choice choice) {
+        @Override
+        public void visit(Choice choice) {
             if (choice.alternatives().size()<2) return; // No choice...
             resolve(choice,query,result,resolution);
         }
 
-        public @Override void visit(MapChoice choice) {
+        @Override
+        public void visit(MapChoice choice) {
             resolve(choice,query,result,resolution);
         }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java
index e0185554066..a0db7c74ecd 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java
@@ -34,7 +34,8 @@ class SourceOrderComparator extends ChainableComparator {
         this.sourceOrder=sourceOrder;
     }
 
-    public @Override int compare(Hit h1,Hit h2) {
+    @Override
+    public int compare(Hit h1,Hit h2) {
         int primaryOrder=sourceOrderCompare(h1,h2);
         if (primaryOrder!=0) return primaryOrder;
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java
index 4100ca5504c..f7df75bffc2 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java
@@ -27,9 +27,11 @@ public class Layout {
 
     public String getName() { return name; }
 
-    public @Override int hashCode() { return name.hashCode(); }
+    @Override
+    public int hashCode() { return name.hashCode(); }
 
-    public @Override boolean equals(Object o) {
+    @Override
+    public boolean equals(Object o) {
         if (o==this) return true;
         if (! (o instanceof Layout)) return false;
         Layout other=(Layout)o;
@@ -45,6 +47,7 @@ public class Layout {
         return new Layout(layout);
     }
 
-    public @Override String toString() { return "layout '" + name + "'"; }
+    @Override
+    public String toString() { return "layout '" + name + "'"; }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java
index ccfad1673aa..bff04df2ee8 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java
@@ -54,7 +54,8 @@ public class MapChoice extends AbstractChoice {
     }
 
     /** Accepts a visitor to this structure */
-    public @Override void accept(PageTemplateVisitor visitor) {
+    @Override
+    public void accept(PageTemplateVisitor visitor) {
         visitor.visit(this);
         for (List<PageElement> valueEntry : values)
             for (PageElement value : valueEntry)
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java
index 0eb98f329cb..79743194c74 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java
@@ -26,14 +26,17 @@ public class Placeholder implements PageElement {
 
     public void setValueContainer(MapChoice valueContainer) { this.valueContainer=valueContainer; }
 
-    public @Override void freeze() {}
+    @Override
+    public void freeze() {}
 
     /** Accepts a visitor to this structure */
-    public @Override void accept(PageTemplateVisitor visitor) {
+    @Override
+    public void accept(PageTemplateVisitor visitor) {
         visitor.visit(this);
     }
 
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return "source placeholder '" + id + "'";
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java
index c3a46dbee8b..261df787b80 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java
@@ -71,17 +71,20 @@ public final class Renderer extends FreezableClass implements PageElement {
      */
     public Map<String,String> parameters() { return parameters; }
 
-    public @Override void freeze() {
+    @Override
+    public void freeze() {
         if (isFrozen()) return;
         super.freeze();
         parameters = Collections.unmodifiableMap(parameters);
     }
 
     /** Accepts a visitor to this structure */
-    public @Override void accept(PageTemplateVisitor visitor) {
+    @Override
+    public void accept(PageTemplateVisitor visitor) {
         visitor.visit(this);
     }
-     public @Override String toString() {
+     @Override
+     public String toString() {
         return "renderer '" + name + "'";
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
index 67f67cb8538..b0f49eddc83 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
@@ -149,7 +149,8 @@ public class Section extends FreezableClass implements PageElement {
         this.min=min;
     }
 
-    public @Override void freeze() {
+    @Override
+    public void freeze() {
         if (isFrozen()) return;
 
         for (PageElement element : elements)
@@ -163,13 +164,15 @@ public class Section extends FreezableClass implements PageElement {
     }
 
     /** Accepts a visitor to this structure */
-    public @Override void accept(PageTemplateVisitor visitor) {
+    @Override
+    public void accept(PageTemplateVisitor visitor) {
         visitor.visit(this);
         for (PageElement element : elements)
             element.accept(visitor);
     }
 
-    public @Override String toString() {
+    @Override
+    public String toString() {
         if (id==null || id.isEmpty()) return "a section";
         return "section '" + id + "'";
     }
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java
index de1cadff5db..7877aae5ca8 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java
@@ -75,7 +75,8 @@ public class Source extends FreezableClass implements PageElement {
      */
     public Map<String,String> parameters() { return parameters; }
 
-    public @Override void freeze() {
+    @Override
+    public void freeze() {
         if (isFrozen()) return;
         for (PageElement element : renderers) {
             if (element instanceof Renderer) {
@@ -103,13 +104,15 @@ public class Source extends FreezableClass implements PageElement {
     }
 
     /** Accepts a visitor to this structure */
-    public @Override void accept(PageTemplateVisitor visitor) {
+    @Override
+    public void accept(PageTemplateVisitor visitor) {
         visitor.visit(this);
         for (PageElement renderer : renderers)
             renderer.accept(visitor);
     }
 
-    public @Override int hashCode() {
+    @Override
+    public int hashCode() {
         if (isFrozen()) return hashCode;
         int hashCode=name.hashCode();
         int i=0;
@@ -118,7 +121,8 @@ public class Source extends FreezableClass implements PageElement {
         return hashCode;
     }
 
-    public @Override boolean equals(Object other) {
+    @Override
+    public boolean equals(Object other) {
         if (other==this) return true;
         if (! (other instanceof Source)) return false;
         Source otherSource=(Source)other;
@@ -130,7 +134,8 @@ public class Source extends FreezableClass implements PageElement {
         return true;
     }
 
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return "source '" + name + "'";
     }
 
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() + "'" : "");
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java
index 536e31ba26e..a6ed3427cca 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java
@@ -41,17 +41,20 @@ public class PropertyAliases extends Properties {
         return (properName != null) ? properName : nameOrAlias;
     }
 
-    public @Override Map<String, Object> listProperties(CompoundName property,Map<String,String> context,
+    @Override
+    public Map<String, Object> listProperties(CompoundName property,Map<String,String> context,
                                                         com.yahoo.processing.request.Properties substitution) {
         return super.listProperties(unalias(property),context,substitution);
     }
 
-    public @Override Object get(CompoundName name,Map<String,String> context,
+    @Override
+    public Object get(CompoundName name,Map<String,String> context,
                                 com.yahoo.processing.request.Properties substitution) {
         return super.get(unalias(name),context,substitution);
     }
 
-    public @Override void set(CompoundName name,Object value,Map<String,String> context) {
+    @Override
+    public void set(CompoundName name,Object value,Map<String,String> context) {
         super.set(unalias(name),value,context);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java
index 76d94f3f0a2..456b0df3fe5 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java
@@ -39,7 +39,8 @@ public class PropertyMap extends Properties {
      */
     protected boolean shouldSet(CompoundName name,Object value) { return true; }
 
-    public @Override Object get(CompoundName name, Map<String,String> context,
+    @Override
+    public Object get(CompoundName name, Map<String,String> context,
                                 com.yahoo.processing.request.Properties substitution) {
         if ( ! properties.containsKey(name)) return super.get(name,context,substitution);
         return properties.get(name);
@@ -52,7 +53,8 @@ public class PropertyMap extends Properties {
         return properties;
     }
 
-    public @Override PropertyMap clone() {
+    @Override
+    public PropertyMap clone() {
         PropertyMap clone = (PropertyMap)super.clone();
         clone.properties = new HashMap<>();
         for (Map.Entry<CompoundName, Object> entry : this.properties.entrySet()) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java
index bb76c1006f2..9c39b93c4ec 100644
--- a/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java
@@ -258,7 +258,8 @@ public abstract class QueryRewriteSearcher extends Searcher {
      * - Pass to the next rewriter the query to be used
      *   for dictionary retrieval<br>
      */
-    public @Override Result search(Query query, Execution execution) {
+    @Override
+    public Result search(Query query, Execution execution) {
         RewriterUtils.log(logger, query, "Executing " + getRewriterName());
 
         // Check if rewriter is properly initialized
diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/SearchChainDispatcherSearcher.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/SearchChainDispatcherSearcher.java
index 589696c4e77..f7f9489174d 100644
--- a/container-search/src/main/java/com/yahoo/search/query/rewrite/SearchChainDispatcherSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/SearchChainDispatcherSearcher.java
@@ -43,7 +43,8 @@ public class SearchChainDispatcherSearcher extends Searcher {
      *   param<br>
      * - Execute specified search chain if exist
      */
-    public @Override Result search(Query query, Execution execution) {
+    @Override
+    public Result search(Query query, Execution execution) {
         RewriterUtils.log(logger, query, "Entering SearchChainDispatcherSearcher");
 
         // Retrieve search chain specified by user through REWRITER_CHAIN
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index e58c3dc847e..3ce808eb75c 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -620,7 +620,8 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
      * Returns true if all the hits recursively contained in this
      * is cached
      */
-    public @Override boolean isCached() {
+    @Override
+    public boolean isCached() {
         if (notCachedCount<1) return true;
         if (subgroupCount<1) return false; // No need to check below
 
diff --git a/container-search/src/main/java/com/yahoo/search/result/Relevance.java b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
index df79b64585e..a6a83dc3c5b 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Relevance.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
@@ -45,7 +45,8 @@ public class Relevance implements Comparable<Relevance> {
     /**
      * Returns the score value as a string
      */
-    public @Override String toString() {
+    @Override
+    public String toString() {
         return DoubleFormatter.stringValue(score);
     }
 
@@ -67,7 +68,8 @@ public class Relevance implements Comparable<Relevance> {
     }
 
     /** Compares relevancy values */
-    public @Override boolean equals(Object object) {
+    @Override
+    public boolean equals(Object object) {
         if (object==this) return true;
 
         if (!(object instanceof Relevance)) { return false; }
@@ -77,7 +79,8 @@ public class Relevance implements Comparable<Relevance> {
     }
 
     /** Returns a hash from the relevancy value */
-    public @Override int hashCode() {
+    @Override
+    public int hashCode() {
         double hash=getScore()*335451367; // A largish prime
         if (hash>-1 && hash<1) hash=1/hash;
         return (int) hash;
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/example/ExampleSearcher.java b/container-search/src/main/java/com/yahoo/search/searchchain/example/ExampleSearcher.java
index 06a4096dc68..afcf5deede7 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/example/ExampleSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/example/ExampleSearcher.java
@@ -14,7 +14,8 @@ import com.yahoo.search.searchchain.Execution;
  */
 public class ExampleSearcher extends Searcher {
 
-    public @Override Result search(Query query,Execution execution) {
+    @Override
+    public Result search(Query query,Execution execution) {
         Result result=execution.search(query);
         result.hits().add(new Hit("example",1.0,"examplesearcher"));
         return result;
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
index e59808bdf5d..448098f6f06 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
@@ -94,7 +94,8 @@ public class DocumentSourceSearcher extends Searcher {
         addResult(q, r);
     }
 
-    public @Override Result search(Query query, Execution execution)  {
+    @Override
+    public Result search(Query query, Execution execution)  {
         queryCount++;
         Result r;
         r = unFilledResults.get(getQueryKeyClone(query));
@@ -119,7 +120,8 @@ public class DocumentSourceSearcher extends Searcher {
         return key;
     }
 
-    public @Override void fill(Result result, String summaryClass, Execution execution) {
+    @Override
+    public void fill(Result result, String summaryClass, Execution execution) {
         Result filledResult;
         filledResult = completelyFilledResults.get(getQueryKeyClone(result.getQuery()));
 
diff --git a/container-search/src/main/java/com/yahoo/text/interpretation/Interpretation.java b/container-search/src/main/java/com/yahoo/text/interpretation/Interpretation.java
index d80ff80f172..ae328886ede 100644
--- a/container-search/src/main/java/com/yahoo/text/interpretation/Interpretation.java
+++ b/container-search/src/main/java/com/yahoo/text/interpretation/Interpretation.java
@@ -360,7 +360,8 @@ public class Interpretation {
         return rootSpan.getTermSpans(term);
     }
 
-    public @Override String toString() {
+    @Override
+    public String toString() {
         StringBuilder sb = new StringBuilder();
         Map<AnnotationClass, List<Annotations>> annotations = getAll();
         Iterator<Map.Entry<AnnotationClass,List<Annotations>>> mapIterator = annotations.entrySet().iterator();
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java
index 40d68a29a71..35beb5cb96c 100644
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java
@@ -112,7 +112,8 @@ public class TilingTestCase extends junit.framework.TestCase {
 
     private static class TiledResultProducer extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=new Result(query);
             result.setTotalHitCount(2800000000l);
 
@@ -256,7 +257,8 @@ public class TilingTestCase extends junit.framework.TestCase {
 
     private static class TiledResultProducer2 extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=new Result(query);
             result.setTotalHitCount(1);
 
diff --git a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java
index 2dd3131eb6e..58107513ee2 100644
--- a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java
@@ -31,7 +31,8 @@ public class ClusterSearcherTestCase extends TestCase {
             this.hit = hit;
         }
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result = execution.search(query);
             result.hits().add(hit);
             return result;
@@ -127,15 +128,18 @@ public class ClusterSearcherTestCase extends TestCase {
             super(id,searchers,hasher,false);
         }
 
-        public @Override Result search(Query query,Execution execution,Searcher searcher) {
+        @Override
+        public Result search(Query query,Execution execution,Searcher searcher) {
             return searcher.search(query,execution);
         }
 
-        public @Override void fill(Result result,String summaryName,Execution execution,Searcher searcher) {
+        @Override
+        public void fill(Result result,String summaryName,Execution execution,Searcher searcher) {
             searcher.fill(result,summaryName,execution);
         }
 
-        public @Override Pong ping(Ping ping,Searcher searcher) {
+        @Override
+        public Pong ping(Ping ping,Searcher searcher) {
             return new Execution(searcher, Execution.Context.createContextStub()).ping(ping);
         }
 
diff --git a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java
index 06686e8777a..01fea6f0842 100644
--- a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java
@@ -161,17 +161,20 @@ public class ClusteredConnectionTestCase extends junit.framework.TestCase {
             super(componentId,connections,false);
         }
 
-        public @Override Result search(Query query,Execution execution,Connection connection) {
+        @Override
+        public Result search(Query query,Execution execution,Connection connection) {
             Result result=new Result(query);
             result.hits().add(new Hit("from:" + connection.getResponse()));
             return result;
         }
 
-        public @Override void fill(Result result,String summary,Execution execution,Connection connection) {
+        @Override
+        public void fill(Result result,String summary,Execution execution,Connection connection) {
             result.hits().get(0).fields().put("filled",connection.getResponse());
         }
 
-        public @Override Pong ping(Ping ping,Connection connection) {
+        @Override
+        public Pong ping(Ping ping,Connection connection) {
             Pong pong=new Pong();
             if (connection.getResponse()==null)
                 pong.addError(ErrorMessage.createBackendCommunicationError("No ping response from '" + connection + "'"));
@@ -189,7 +192,8 @@ public class ClusteredConnectionTestCase extends junit.framework.TestCase {
             this.hashValue = hashValue;
         }
 
-        public @Override int hashCode() {
+        @Override
+        public int hashCode() {
             return hashValue;
         }
 
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
index 11698b2b70d..2dd46b54661 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
@@ -113,7 +113,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase {
 
     public static class DefaultSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=execution.search(query);
             result.hits().add(new Hit("from:default"));
             return result;
@@ -123,7 +124,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase {
 
     public static class TestSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=execution.search(query);
             result.hits().add(new Hit("from:test"));
             return result;
@@ -135,7 +137,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase {
     @Provides("SomeObject")
     public static class SettingSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             SomeObject.setTo(query,new SomeObject());
             return execution.search(query);
         }
@@ -146,7 +149,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase {
     @After("SomeObject")
     public static class ReceivingSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             assertNotNull(SomeObject.getFrom(query));
             assertEquals(SomeObject.class,SomeObject.getFrom(query).getClass());
             return execution.search(query);
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java
index 4e68ac92adc..7877e48ea50 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java
@@ -194,11 +194,14 @@ public class CloningTestCase extends junit.framework.TestCase {
 
         public void set(String string) { this.string=string; }
 
-        public @Override String toString() { return string; }
+        @Override
+        public String toString() { return string; }
 
-        public @Override int hashCode() { return string.hashCode(); }
+        @Override
+        public int hashCode() { return string.hashCode(); }
 
-        public @Override boolean equals(Object other) {
+        @Override
+        public boolean equals(Object other) {
             if (other==this) return true;
             if ( ! (other instanceof MutableString)) return false;
             return ((MutableString)other).string.equals(string);
@@ -212,7 +215,8 @@ public class CloningTestCase extends junit.framework.TestCase {
             super(string);
         }
 
-        public @Override CloneableMutableString clone() {
+        @Override
+        public CloneableMutableString clone() {
             try {
                 return (CloneableMutableString)super.clone();
             }
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java
index 4d611e3e842..17475d20292 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java
@@ -92,7 +92,8 @@ public class SearchChainConfigurerTestCase {
     }
 
    public static abstract class TestSearcher extends Searcher {
-        public @Override Result search(Query query, Execution execution) {
+        @Override
+        public Result search(Query query, Execution execution) {
             return execution.search(query);
         }
     }
@@ -234,7 +235,8 @@ public class SearchChainConfigurerTestCase {
             this.intConfig = intConfig;
             this.stringConfig = stringConfig;
         }
-        public @Override Result search(Query query, Execution execution) {
+        @Override
+        public Result search(Query query, Execution execution) {
             return execution.search(query);
         }
     }
@@ -244,7 +246,8 @@ public class SearchChainConfigurerTestCase {
         public IntSearcher(IntConfig intConfig) {
             this.intConfig = intConfig;
         }
-        public @Override Result search(Query query, Execution execution) {
+        @Override
+        public Result search(Query query, Execution execution) {
             return execution.search(query);
         }
     }
@@ -254,7 +257,8 @@ public class SearchChainConfigurerTestCase {
         public StringSearcher(StringConfig stringConfig) {
             this.stringConfig = stringConfig;
         }
-        public @Override Result search(Query query, Execution execution) {
+        @Override
+        public Result search(Query query, Execution execution) {
             return execution.search(query);
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java
index 6c38df8fe08..92bc09c0162 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java
@@ -13,7 +13,8 @@ public class UpdateSearcher extends com.yahoo.search.Searcher {
 
     public String test = "update";
 
-    public @Override Result search(Query query,Execution execution) {
+    @Override
+    public Result search(Query query,Execution execution) {
         Result result=execution.search(query);
         if (result==null)
             result=new Result(query);
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java
index 642d8d8cd7e..5b1d99363a3 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java
@@ -219,7 +219,8 @@ public class ExecutionTestCase extends junit.framework.TestCase {
             super(new ComponentId(id));
         }
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=execution.search(query);
             result.hits().add(new Hit(getId().stringValue() + "-" + (counter++)));
             return result;
@@ -229,7 +230,8 @@ public class ExecutionTestCase extends junit.framework.TestCase {
 
     public static class ForwardingSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Chain<Searcher> forwardTo=execution.context().searchChainRegistry().getChain("someChainId");
             return new Execution(forwardTo,execution.context()).search(query);
 
@@ -245,7 +247,8 @@ public class ExecutionTestCase extends junit.framework.TestCase {
             super(new ComponentId(id));
         }
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=execution.search(query);
             Hit hit=new Hit(getId().stringValue() + "-" + counter);
             hit.setFillable();
@@ -253,7 +256,8 @@ public class ExecutionTestCase extends junit.framework.TestCase {
             return result;
         }
 
-        public @Override void fill(Result result,String summaryClass,Execution execution) {
+        @Override
+        public void fill(Result result,String summaryClass,Execution execution) {
             result.hits().add(new Hit(getId().stringValue() + "-" + (counter++) + "-filled")); // Not something one would normally do in fill
         }
 
@@ -270,7 +274,8 @@ public class ExecutionTestCase extends junit.framework.TestCase {
     @After("com.yahoo.search.searchchain.test.ExecutionTestCase$TestSearcher")
     public static class FillingSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result=execution.search(query);
             execution.fill(result);
             return result;
@@ -282,7 +287,8 @@ public class ExecutionTestCase extends junit.framework.TestCase {
     @Before("com.yahoo.search.searchchain.test.ExecutionTestCase$TestSearcher")
     public static class WorkflowSearcher extends Searcher {
 
-        public @Override Result search(Query query,Execution execution) {
+        @Override
+        public Result search(Query query,Execution execution) {
             Result result1=execution.search(query);
             Result result2=execution.search(query);
             for (Iterator<Hit> i=result2.hits().iterator(); i.hasNext();)
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
index 1fe62c2cd35..0932b202dac 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
@@ -114,7 +114,8 @@ public class MetricsSearcherTestCase {
             this.implicitlyCreateContext = implicitlyCreateContext;
         }
 
-        public @Override Result search(Query query, Execution execution) {
+        @Override
+        public Result search(Query query, Execution execution) {
             if (implicitlyCreateContext) {
                 String loadType = query.properties().getString("streaming.loadtype");
                 assignContextProperties(query, loadType);