Nonfunctional changes only

3 files changed, 18 insertions, 27 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Result.java b/container-search/src/main/java/com/yahoo/search/Result.java
index ded8992fa65..7978798f53c 100644
--- a/container-search/src/main/java/com/yahoo/search/Result.java
+++ b/container-search/src/main/java/com/yahoo/search/Result.java
@@ -46,7 +46,7 @@ public final class Result extends com.yahoo.processing.Response implements Clone
      * Headers containing "envelope" meta information to be returned with this result.
      * Used for HTTP getHeaders when the return protocol is HTTP.
      */
-    private ListMap<String,String> headers=null;
+    private ListMap<String,String> headers = null;
 
     /**
      * Result rendering infrastructure.
diff --git a/container-search/src/main/java/com/yahoo/search/statistics/ElapsedTime.java b/container-search/src/main/java/com/yahoo/search/statistics/ElapsedTime.java
index 82438bda34e..804ce1b496b 100644
--- a/container-search/src/main/java/com/yahoo/search/statistics/ElapsedTime.java
+++ b/container-search/src/main/java/com/yahoo/search/statistics/ElapsedTime.java
@@ -12,13 +12,11 @@ import java.util.Set;
 import static com.yahoo.search.statistics.TimeTracker.Activity.*;
 
 /**
- * Basically a collection of TimeTracker instances.
+ * A collection of TimeTracker instances.
  *
- * <p>This class may need a lot of restructuring as actual
- * needs are mapped out.
- *
- * @author <a href="steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
+// This class may need a lot of restructuring as actual needs are mapped out.
 public class ElapsedTime {
 
     // An identity set is used to make it safe to do multiple merges. This may happen if
@@ -35,16 +33,11 @@ public class ElapsedTime {
 
     private long fetcher(Activity toFetch, TimeTracker fetchFrom) {
         switch (toFetch) {
-        case SEARCH:
-            return fetchFrom.searchTime();
-        case FILL:
-            return fetchFrom.fillTime();
-        case PING:
-            return fetchFrom.pingTime();
-        default:
-            return 0L;
+            case SEARCH: return fetchFrom.searchTime();
+            case FILL:   return fetchFrom.fillTime();
+            case PING:   return fetchFrom.pingTime();
+            default:     return 0L;
         }
-
     }
 
     /**
@@ -232,4 +225,5 @@ public class ElapsedTime {
         report.append(".");
         return report.toString();
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/statistics/TimeTracker.java b/container-search/src/main/java/com/yahoo/search/statistics/TimeTracker.java
index 6112bc504d3..d2461dffc7a 100644
--- a/container-search/src/main/java/com/yahoo/search/statistics/TimeTracker.java
+++ b/container-search/src/main/java/com/yahoo/search/statistics/TimeTracker.java
@@ -1,25 +1,24 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.statistics;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-
 import com.yahoo.component.chain.Chain;
 import com.yahoo.prelude.Pong;
 import com.yahoo.processing.Processor;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
 /**
- * A container for storing time stamps throughout the
- * lifetime of an Execution instance.
+ * A container for storing time stamps throughout the lifetime of an Execution instance.
  *
  * <p>Check state both when entering and exiting, to allow for arbitrary
  * new queries anywhere inside a search chain.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public final class TimeTracker {
 
@@ -214,8 +213,6 @@ public final class TimeTracker {
             }
             concludeState(now);
             initNewState(now, activity);
-        } else {
-            return;
         }
     }
 
@@ -314,7 +311,7 @@ public final class TimeTracker {
         return typedSum(Activity.PING);
     }
 
-    private long returnfromState(int searcherIndex, boolean detailed) {
+    private long returnFromState(int searcherIndex, boolean detailed) {
         if (detailed) {
             return detailedMeasurements(searcherIndex, false);
         } else {
@@ -350,7 +347,7 @@ public final class TimeTracker {
     }
 
     private void sampleReturn(int searcherIndex, boolean detailed, ElapsedTime elapsed) {
-        long now = returnfromState(searcherIndex, detailed);
+        long now = returnFromState(searcherIndex, detailed);
         if (searcherIndex == entryIndex) {
             concludeStateOnExit(now);
             if (elapsed != null) {