Nonfunctional changes only

4 files changed, 11 insertions, 8 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java b/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java
index 01e359cdcf9..119c4eb9e0a 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java
@@ -2,9 +2,10 @@
 package com.yahoo.search.federation;
 /**
  * A set of string constants for common hit field names.
- * @author laboisse
  *
+ * @author laboisse
  */
+// TODO: Deprecate and remove
 public class CommonFields {
 
 	public static final String TITLE = "title";
@@ -19,4 +20,5 @@ public class CommonFields {
 	public static final String THUMBNAIL_URL = "thumbnailUrl";
 	public static final String THUMBNAIL_WIDTH = "thumbnailWidth";
 	public static final String THUMBNAIL_HEIGHT = "thumbnailHeight";
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
index 2d84a536da6..9034484b022 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
@@ -65,7 +65,7 @@ import static com.yahoo.search.federation.StrictContractsConfig.PropagateSourceP
  * This searcher takes a set of sources, looks them up in config and fire off the correct searchchains.
  *
  * @author Arne Bergene Fossaa
- * @author tonytv
+ * @author Tony Vaagenes
  * @author bratseth
  */
 @Provides(FederationSearcher.FEDERATION)
diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
index b0168315d28..2bfec008761 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
@@ -9,10 +9,11 @@ import com.yahoo.prelude.query.*;
  * Marshal a query stack into an advanced query string suitable for
  * passing to another QRS.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:rafan@yahoo-inc.com">Rong-En Fan</a>
+ * @author Steinar Knutsen
+ * @author Rong-En Fan
  */
 public class QueryMarshaller {
+
     private boolean atRoot = true;
 
     public String marshal(Item root) {
@@ -168,4 +169,5 @@ public class QueryMarshaller {
             s.append(" )");
         }
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
index 4c7192f774b..71971b56ef1 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
@@ -29,10 +29,9 @@ import static com.yahoo.text.Lowercase.toLowerCase;
 /**
  * Parse Vespa XML results and create Result instances.
  *
- * <p> TODO: Ripe for a rewrite or major refactoring.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
+// Ripe for a rewrite or major refactoring.
 @SuppressWarnings("deprecation")
 public class ResultBuilder extends DefaultHandler {
     private static final String ERROR = "error";
@@ -509,7 +508,7 @@ public class ResultBuilder extends DefaultHandler {
             if (ERROR.equals(qName)) {
                 ErrorMessage error = new ErrorMessage(Integer.valueOf(currentErrorCode),
                         fieldContent.toString());
-                hitGroups.peekFirst().setError(error);
+                hitGroups.peekFirst().addError(error);
                 currentErrorCode = null;
                 fieldContent = null;
             }