Simplify

9 files changed, 32 insertions, 35 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index e599d06f6c7..1c2f409d792 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -202,7 +202,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
 
         argumentType.addField(new FieldDescription(OFFSET.toString(), "integer", "offset start"));
         argumentType.addField(new FieldDescription(HITS.toString(), "integer", "hits count"));
-        // TODO: Should this be added to com.yahoo.search.query.properties.QueryProperties? If not, why not?
         argumentType.addField(new FieldDescription(QUERY_PROFILE.toString(), "string"));
         argumentType.addField(new FieldDescription(SEARCH_CHAIN.toString(), "string"));
         argumentType.addField(new FieldDescription(TRACE_LEVEL.toString(), "integer", "tracelevel"));
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 f901194d7e6..ff099d4d490 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
@@ -208,16 +208,15 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
             result = search(query, execution, connection);
         } catch (RuntimeException e) { //TODO: Exceptions should not be used to signal backend communication errors
             log(LogLevel.WARNING, "An exception occurred while invoking backend searcher.", e);
-            result = new Result(query, ErrorMessage
-                    .createBackendCommunicationError("Failed calling "
-                            + connection + " in " + this + " for " + query
-                            + ": " + Exceptions.toMessageString(e)));
+            result = new Result(query, ErrorMessage.createBackendCommunicationError("Failed calling " + connection +
+                                                                                    " in " + this + " for " + query +
+                                                                                    ": " + Exceptions.toMessageString(e)));
         }
 
         if (result == null)
             result = new Result(query, ErrorMessage
-                    .createBackendCommunicationError("No result returned in "
-                            + this + " from " + connection + " for " + query));
+                    .createBackendCommunicationError("No result returned in " + this +
+                                                     " from " + connection + " for " + query));
 
         if (result.hits().getError() != null) {
             log(LogLevel.FINE, "FAILED: ", query);
@@ -235,8 +234,8 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
      */
     protected abstract Result search(Query query, Execution execution, T connection);
 
-    public @Override
-    final void fill(Result result, String summaryClass, Execution execution) {
+    @Override
+    public final void fill(Result result, String summaryClass, Execution execution) {
         Query query = result.getQuery();
         Hasher.NodeList<T> nodes = getHasher().getNodes();
         int code = query.hashCode();
@@ -245,17 +244,14 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         if (connection != null) {
             if (timedOut(query)) {
                 result.hits().addError(
-                        ErrorMessage.createTimeout(
-                                "No time left to get summaries for "
-                                + result));
+                        ErrorMessage.createTimeout("No time left to get summaries for " + result));
             } else {
                 // query.setTimeout(getNodeTimeout(query));
                 doFill(connection, result, summaryClass, execution);
             }
         } else {
             result.hits().addError(
-                    ErrorMessage.createNoBackendsInService("Could not fill '"
-                            + result + "' in '" + this + "'"));
+                    ErrorMessage.createNoBackendsInService("Could not fill '" + result + "' in '" + this + "'"));
         }
     }
 
@@ -265,13 +261,12 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         } catch (RuntimeException e) {
             result.hits().addError(
                     ErrorMessage
-                            .createBackendCommunicationError("Error filling "
-                                    + result + " from " + connection + ": "
-                                    + Exceptions.toMessageString(e)));
+                            .createBackendCommunicationError("Error filling " + result + " from " + connection + ": " +
+                                                             Exceptions.toMessageString(e)));
         }
         if (result.hits().getError() != null) {
             log(LogLevel.FINE, "FAILED: ", result.getQuery());
-        } else if (!result.isCached()) {
+        } else if ( ! result.isCached()) {
             log(LogLevel.FINE, "WORKING: ", result.getQuery());
         } else {
             log(LogLevel.FINE, "CACHE HIT: " + result.getQuery());
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 119c4eb9e0a..8d970ddacad 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
@@ -4,8 +4,9 @@ package com.yahoo.search.federation;
  * A set of string constants for common hit field names.
  *
  * @author laboisse
+ * @deprecated do not use
  */
-// TODO: Deprecate and remove
+@Deprecated // TODO: Remove on Vespa 8
 public class CommonFields {
 
 	public static final String TITLE = "title";
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
index f4c98075a5a..9c7e1024518 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
@@ -10,6 +10,7 @@ import com.yahoo.processing.request.Properties;
 * @author Tony Vaagenes
 */
 public class SingleTarget extends Target {
+
     private final SearchChainInvocationSpec searchChainInvocationSpec;
 
     public SingleTarget(ComponentId id, SearchChainInvocationSpec searchChainInvocationSpec, boolean isDerived) {
@@ -33,4 +34,5 @@ public class SingleTarget extends Target {
     public final boolean useByDefault() {
         return searchChainInvocationSpec.federationOptions.getUseByDefault();
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
index 2e11b73e1df..df138364b5b 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
@@ -52,15 +52,16 @@ public class SearchResponse {
     public static Timing createTiming(Query query, Result result) {
         return new Timing(result.getElapsedTime().firstFill(),
                           0,
-                          result.getElapsedTime().first(), query.getTimeout());
+                          result.getElapsedTime().first(),
+                          query.getTimeout());
     }
 
     public static HitCounts createHitCounts(Query query, Result result) {
         return new HitCounts(result.getHitCount(),
-                          result.getConcreteHitCount(),
-                          result.getTotalHitCount(),
-                          query.getHits(),
-                          query.getOffset());
+                             result.getConcreteHitCount(),
+                             result.getTotalHitCount(),
+                             query.getHits(),
+                             query.getOffset());
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Node.java b/container-search/src/main/java/com/yahoo/search/intent/model/Node.java
index 74a9d63a995..98bfd588004 100644
--- a/container-search/src/main/java/com/yahoo/search/intent/model/Node.java
+++ b/container-search/src/main/java/com/yahoo/search/intent/model/Node.java
@@ -4,7 +4,7 @@ package com.yahoo.search.intent.model;
 import java.util.Map;
 
 /**
- * A node in the <a href="TODO">intent model tree</a>
+ * A node in the intent model tree
  *
  * @author bratseth
  */
@@ -17,24 +17,24 @@ public abstract class Node implements Comparable<Node> {
     private double score;
 
     public Node(double score) {
-        this.score=score;
+        this.score = score;
     }
 
     /** Returns the normalized (0-1) score of this node */
     public double getScore() { return score; }
 
     /** Sets the normalized (0-1) score of this node */
-    public void setScore(double score) { this.score=score; }
+    public void setScore(double score) { this.score = score; }
 
     /** Increases this score by an increment and returns the new score */
     public double increaseScore(double increment) {
-        setScore(getScore()+increment);
+        setScore(getScore() + increment);
         return getScore();
     }
 
     public int compareTo(Node other) {
-        if (this.getScore()<other.getScore()) return 1;
-        if (this.getScore()>other.getScore()) return -1;
+        if (this.getScore() < other.getScore()) return 1;
+        if (this.getScore() > other.getScore()) return -1;
         return 0;
     }
 
@@ -43,6 +43,6 @@ public abstract class Node implements Comparable<Node> {
      * sparsely represented source vector, weighted by the score of this node
      * times the given weight from the parent path
      */
-    abstract void addSources(double weight,Map<Source,SourceNode> sources);
+    abstract void addSources(double weight, Map<Source, SourceNode> sources);
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java
index 0157543cce3..c5348e19524 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java
@@ -23,7 +23,6 @@ public abstract class AbstractChoice extends FreezableClass implements PageEleme
         this.method=method;
     }
 
-    // TODO: is this really choices between classes in general, or e.g. subclasses of Section?
     /** Returns true if this choice is (partially or completely) a choice between the given type */
     @SuppressWarnings("rawtypes")
     public abstract boolean isChoiceBetween(Class pageTemplateModelClass);
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java b/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java
index 4c8d6f65cba..f75260bae3c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java
@@ -37,12 +37,12 @@ public class CopyOnWriteContent extends FreezableClass implements Cloneable {
     // (COPYONWRITE,WRITABLE)->FROZEN: When a profile is frozen
 
     /** The modifiable content of this. Null if this is empty or if this is not in the WRITABLE state */
-    private Map<String,Object> map=null;
+    private Map<String ,Object> map=null;
     /**
      * If map is non-null this is either null (not instantiated yet) or an unmodifiable wrapper of map,
      * if map is null this is either null (this is empty) or a reference to the map of the content this was cloned from
      */
-    private Map<String,Object> unmodifiableMap =null;
+    private Map<String, Object> unmodifiableMap =null;
 
     /** Create a WRITABLE, empty instance */
     public CopyOnWriteContent() {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java
index a18b93b8a6f..316baa26198 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java
@@ -47,7 +47,7 @@ public class LocalProviderSpec {
 
     public final String clusterName;
 
-    //TODO: make this final
+    // TODO: make this final
     public Integer cacheSize;
 
     public LocalProviderSpec(String clusterName, Integer cacheSize) {