Nonfunctional changes only

3 files changed, 12 insertions, 19 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 84db07d20da..be3c29bed60 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -243,8 +243,7 @@ public class SearchHandler extends LoggingRequestHandler {
     }
 
 
-    private HttpSearchResponse handleBody(HttpRequest request){
-
+    private HttpSearchResponse handleBody(HttpRequest request) {
         Map<String, String> requestMap = requestMapFromRequest(request);
 
         // Get query profile
@@ -278,13 +277,11 @@ public class SearchHandler extends LoggingRequestHandler {
         if (invalidReason != null) {
             result = new Result(query, ErrorMessage.createIllegalQuery(invalidReason));
         } else if (queryProfile == null && queryProfileName != null) {
-            result = new Result(
-                    query,
-                    ErrorMessage.createIllegalQuery("Could not resolve query profile '" + queryProfileName + "'"));
+            result = new Result(query,
+                                ErrorMessage.createIllegalQuery("Could not resolve query profile '" + queryProfileName + "'"));
         } else if (searchChain == null) {
-            result = new Result(
-                    query,
-                    ErrorMessage.createInvalidQueryParameter("No search chain named '" + searchChainName + "' was found"));
+            result = new Result(query,
+                                ErrorMessage.createInvalidQueryParameter("No search chain named '" + searchChainName + "' was found"));
         } else {
             String pathAndQuery = UriTools.rawRequest(request.getUri());
             result = search(pathAndQuery, query, searchChain);
diff --git a/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java b/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java
index 30a0d90c309..d358fa06977 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java
@@ -18,15 +18,11 @@ public class ParameterParser {
      * a couple of valid examples are "s" and "ms". Only a very small subset of
      * SI prefixes are supported). If no unit is given, seconds are assumed.
      *
-     * @param value
-     *                some representation of a number of seconds
-     * @param defaultValue
-     *                returned if value is null
+     * @param value some representation of a number of seconds
+     * @param defaultValue returned if value is null
      * @return value as a number of milliseconds
-     * @throws NumberFormatException
-     *                 if value is not a Number instance and its String
-     *                 representation cannot be parsed as a number followed
-     *                 optionally by time unit
+     * @throws NumberFormatException if value is not a Number instance and its String
+     *         representation cannot be parsed as a number followed optionally by time unit
      */
     public static Long asMilliSeconds(Object value, Long defaultValue) {
         if (value == null) {
@@ -40,13 +36,12 @@ public class ParameterParser {
     }
 
     private static Long parseTime(String time) throws NumberFormatException {
-
         time = time.trim();
         try {
             int unitOffset = findUnitOffset(time);
             double measure = Double.valueOf(time.substring(0, unitOffset));
             double multiplier = parseUnit(time.substring(unitOffset));
-            return Long.valueOf((long) (measure * multiplier));
+            return (long) (measure * multiplier);
         } catch (RuntimeException e) {
             throw new IllegalArgumentException("Error parsing " + quote(time), e);
         }
@@ -85,4 +80,5 @@ public class ParameterParser {
         }
         return multiplier;
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java b/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
index a5b51e60861..98fcd30d980 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
@@ -47,7 +47,7 @@ abstract public class Renderer extends com.yahoo.processing.rendering.Renderer<R
             throw new RuntimeException(e);
         }
         finally {
-            if (writer !=null)
+            if (writer != null)
                 try { writer.close(); } catch (IOException e2) {};
         }
         SettableFuture<Boolean> completed = SettableFuture.create();