use standard formatting for Override annotation

13 files changed, 56 insertions, 28 deletions

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 + "'";
     }