From 7e0fe7417136217d0b14534e8b78ef26a6887478 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Sat, 10 Jul 2021 21:18:44 +0200
Subject: Non-functional changes only

---
 .../yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java | 1 +
 .../src/main/java/com/yahoo/search/handler/HttpSearchResponse.java | 4 +---
 .../src/main/java/com/yahoo/search/handler/SearchHandler.java      | 7 ++++---
 .../src/main/java/com/yahoo/search/query/context/QueryContext.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java
index 2e316bfd2c1..b86a4b6fbff 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java
@@ -12,6 +12,7 @@ import java.util.TreeMap;
 * @author Thomas Gundersen
 */
 public class SearchDefinitionBuilder {
+
     public Map<String, NewDocumentType> build(DocumentTypeRepo repo, ModelElement elem) {
         Map<String, NewDocumentType> docTypes = new TreeMap<>();
 
diff --git a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
index 7ef9ebad010..aebc6e17904 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
@@ -180,9 +180,7 @@ public class HttpSearchResponse extends ExtendedResponse {
     @Override
     public Iterable<LogValue> getLogValues() {
         QueryContext context = query.getContext(false);
-        return context == null
-                ? Collections::emptyIterator
-                : context::logValueIterator;
+        return context == null ? Collections::emptyIterator : context::logValueIterator;
     }
 
     private class RendererLatencyReporter implements Runnable {
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 f81aab4259d..f7ff7e72745 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
@@ -494,8 +494,8 @@ public class SearchHandler extends LoggingRequestHandler {
         if (maxThreads > 3) {
             // cast to long to avoid overflows if maxThreads is at no
             // log value (maxint)
-            final long maxThreadsAsLong = maxThreads;
-            final long connectionsAsLong = connections;
+            long maxThreadsAsLong = maxThreads;
+            long connectionsAsLong = connections;
             // only log when exactly crossing the limit to avoid
             // spamming the log
             if (connectionsAsLong < maxThreadsAsLong * 9L / 10L) {
@@ -519,7 +519,7 @@ public class SearchHandler extends LoggingRequestHandler {
         // Attempted workaround for missing stack traces
         if (e.getStackTrace().length == 0) {
             log.log(Level.SEVERE, "Failed executing " + query.toDetailString() +
-                                    " [" + request + "], received exception with no context", e);
+                                  " [" + request + "], received exception with no context", e);
         } else {
             log.log(Level.SEVERE, "Failed executing " + query.toDetailString() + " [" + request + "]", e);
         }
@@ -654,6 +654,7 @@ public class SearchHandler extends LoggingRequestHandler {
                 .override(com.yahoo.jdisc.http.HttpRequest.Method.POST, AclMapping.Action.READ)
                 .build();
     }
+
 }
 
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java
index 1ba30275dc1..4fb9e1e9afa 100644
--- a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java
+++ b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java
@@ -38,10 +38,10 @@ public class QueryContext implements Cloneable {
         owner.getModel().getExecution().trace().trace(message,traceLevel);
     }
     /**
-     * Adds a key-value which will be logged to the access log for this query (by doing toString() on the value
+     * Adds a key-value which will be logged to the access log for this query (by doing toString() on the value).
      * Multiple values may be set to the same key. A value cannot be removed once set.
      */
-    public void logValue(String key,Object value) {
+    public void logValue(String key, Object value) {
         owner.getModel().getExecution().trace().logValue(key, value.toString());
     }
 
-- 
cgit v1.2.3