Nonfunctional changes only

13 files changed, 73 insertions, 77 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java
index 15cc4c6c917..bbf14d7dcea 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java
@@ -12,6 +12,7 @@ import java.util.Collection;
  * @author Ulf Lilleengen
  */
 public class ServiceInfo {
+
     private final String serviceName;
     private final String serviceType;
     private final Collection<PortInfo> ports;
@@ -83,4 +84,5 @@ public class ServiceInfo {
         result = 31 * result + hostName.hashCode();
         return result;
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index e444a5db8ac..401e4be9956 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -36,7 +36,6 @@ import java.util.Optional;
 import static com.yahoo.container.QrConfig.Filedistributor;
 import static com.yahoo.container.QrConfig.Rpc;
 
-
 /**
  * @author gjoranv
  * @author Einar M R Rosenvinge
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
index 20e8c664761..7835ab2cf03 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
@@ -60,18 +60,16 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
         ab.activeRotation(getActiveRotation(app));
         app.getModel().getHosts().stream()
                 .sorted((a, b) -> a.getHostname().compareTo(b.getHostname()))
-                .forEach(hostInfo -> {
-            ab.hosts(hostInfo.getHostname(), getHostsConfig(hostInfo));
-        });
+                .forEach(hostInfo -> ab.hosts(hostInfo.getHostname(), getHostsConfig(hostInfo)));
         return ab;
     }
 
     private boolean getActiveRotation(ApplicationInfo app) {
         boolean activeRotation = false;
         for (HostInfo hostInfo : app.getModel().getHosts()) {
-            final Optional<ServiceInfo> container = hostInfo.getServices().stream().filter(
+            Optional<ServiceInfo> container = hostInfo.getServices().stream().filter(
                     serviceInfo -> serviceInfo.getServiceType().equals("container") ||
-                            serviceInfo.getServiceType().equals("qrserver")).
+                                   serviceInfo.getServiceType().equals("qrserver")).
                     findAny();
             if (container.isPresent()) {
                 activeRotation |= Boolean.valueOf(container.get().getProperty("activeRotation").orElse("false"));
@@ -91,7 +89,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
     }
 
     private LbServicesConfig.Tenants.Applications.Hosts.Services.Builder getServiceConfig(ServiceInfo serviceInfo) {
-        final List<String> endpointAliases = Stream.of(serviceInfo.getProperty("endpointaliases").orElse("").split(",")).
+        List<String> endpointAliases = Stream.of(serviceInfo.getProperty("endpointaliases").orElse("").split(",")).
                 filter(prop -> !"".equals(prop)).collect(Collectors.toList());
         endpointAliases.addAll(Stream.of(serviceInfo.getProperty("rotations").orElse("").split(",")).filter(prop -> !"".equals(prop)).collect(Collectors.toList()));
         Collections.sort(endpointAliases);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
index 236cb4e9b97..7c85b51c920 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
@@ -18,6 +18,7 @@ import java.util.Set;
  * @author Christian Andersen
  */
 public class RoutingProducer implements RoutingConfig.Producer {
+
     static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing");
 
     private final Map<TenantName, Set<ApplicationInfo>> models;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index 35b6e4cf644..e7f0d842999 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -88,7 +88,7 @@ public class LbServicesProducerTest {
     }
 
     private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) throws IOException, SAXException {
-        final Zone zone = new Zone(Environment.prod, regionName);
+        Zone zone = new Zone(Environment.prod, regionName);
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()
                                                                                 .zone(zone)
                                                                                 .properties(new DeployProperties.Builder().build())
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
index 309405f1242..f6a089d6fd2 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
@@ -71,7 +71,7 @@ public final class VespaHeaders {
      */
     public static void benchmarkOutput(HeaderFields responseHeaders, boolean benchmarkCoverage,
                                        Timing t, HitCounts c, int errorCount, Coverage coverage) {
-        final long renderStartTime = System.currentTimeMillis();
+        long renderStartTime = System.currentTimeMillis();
         if (c != null) {
             // Fill inn response getHeaders
             responseHeaders.add(BenchmarkingHeaders.NUM_HITS, String.valueOf(c.getRetrievedHitCount()));
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 6945340892b..2e11b73e1df 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
@@ -22,7 +22,7 @@ public class SearchResponse {
     // Remove (the empty) summary feature field if not requested.
     static void removeEmptySummaryFeatureFields(Result result) {
         // TODO: Move to some searcher in Vespa backend search chains
-        if (!result.hits().getQuery().getRanking().getListFeatures())
+        if ( ! result.hits().getQuery().getRanking().getListFeatures())
             for (Iterator<Hit> i = result.hits().unorderedIterator(); i.hasNext();)
                 i.next().removeField(Hit.RANKFEATURES_FIELD);
     }
@@ -42,7 +42,7 @@ public class SearchResponse {
     }
 
     static boolean isSuccess(Result r) {
-        if (r.hits().getErrorHit()==null) return true;
+        if (r.hits().getErrorHit() == null) return true;
         for (Hit hit : r.hits())
             if ( ! hit.isMeta()) return true; // contains data : success
         return false;
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java
index 9a0063e7f07..ca1447b475a 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java
@@ -2,7 +2,6 @@
 package com.yahoo.search.query.profile.test;
 
 import com.yahoo.processing.request.Properties;
-import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.yolean.Exceptions;
 import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileProperties;
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java
index bf7e66122d6..9f890b249d2 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java
@@ -52,7 +52,7 @@ public class QueryProfileTestCase {
     /** Tests cloning, with wrappers used in production in place */
     @Test
     public void testCloning() {
-        QueryProfile classProfile=new QueryProfile("test");
+        QueryProfile classProfile = new QueryProfile("test");
         classProfile.set("a","aValue", null);
         classProfile.set("b",3, null);
 
@@ -68,7 +68,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testFreezing() {
-        QueryProfile profile=new QueryProfile("test");
+        QueryProfile profile = new QueryProfile("test");
         profile.set("a","a-value", null);
         profile.set("b.c","b.c-value", null);
         profile.set("d.e.f","d.e.f-value", null);
@@ -101,12 +101,12 @@ public class QueryProfileTestCase {
 
     @Test
     public void testGetSubObjects() {
-        QueryProfile barn=new QueryProfile("barn");
-        QueryProfile mor=new QueryProfile("mor");
-        QueryProfile far=new QueryProfile("far");
-        QueryProfile mormor=new QueryProfile("mormor");
-        QueryProfile morfar=new QueryProfile("morfar");
-        QueryProfile farfar=new QueryProfile("farfar");
+        QueryProfile barn = new QueryProfile("barn");
+        QueryProfile mor = new QueryProfile("mor");
+        QueryProfile far = new QueryProfile("far");
+        QueryProfile mormor = new QueryProfile("mormor");
+        QueryProfile morfar = new QueryProfile("morfar");
+        QueryProfile farfar = new QueryProfile("farfar");
         mor.addInherited(mormor);
         mor.addInherited(morfar);
         far.addInherited(farfar);
@@ -127,12 +127,12 @@ public class QueryProfileTestCase {
 
     @Test
     public void testInheritance() {
-        QueryProfile barn=new QueryProfile("barn");
-        QueryProfile mor=new QueryProfile("mor");
-        QueryProfile far=new QueryProfile("far");
-        QueryProfile mormor=new QueryProfile("mormor");
-        QueryProfile morfar=new QueryProfile("morfar");
-        QueryProfile farfar=new QueryProfile("farfar");
+        QueryProfile barn = new QueryProfile("barn");
+        QueryProfile mor = new QueryProfile("mor");
+        QueryProfile far = new QueryProfile("far");
+        QueryProfile mormor = new QueryProfile("mormor");
+        QueryProfile morfar = new QueryProfile("morfar");
+        QueryProfile farfar = new QueryProfile("farfar");
         barn.addInherited(mor);
         barn.addInherited(far);
         mor.addInherited(mormor);
@@ -175,12 +175,12 @@ public class QueryProfileTestCase {
 
     @Test
     public void testInheritance2Level() {
-        QueryProfile barn=new QueryProfile("barn");
-        QueryProfile mor=new QueryProfile("mor");
-        QueryProfile far=new QueryProfile("far");
-        QueryProfile mormor=new QueryProfile("mormor");
-        QueryProfile morfar=new QueryProfile("morfar");
-        QueryProfile farfar=new QueryProfile("farfar");
+        QueryProfile barn = new QueryProfile("barn");
+        QueryProfile mor = new QueryProfile("mor");
+        QueryProfile far = new QueryProfile("far");
+        QueryProfile mormor = new QueryProfile("mormor");
+        QueryProfile morfar = new QueryProfile("morfar");
+        QueryProfile farfar = new QueryProfile("farfar");
         barn.addInherited(mor);
         barn.addInherited(far);
         mor.addInherited(mormor);
@@ -223,12 +223,12 @@ public class QueryProfileTestCase {
 
     @Test
     public void testInheritance3Level() {
-        QueryProfile barn=new QueryProfile("barn");
-        QueryProfile mor=new QueryProfile("mor");
-        QueryProfile far=new QueryProfile("far");
-        QueryProfile mormor=new QueryProfile("mormor");
-        QueryProfile morfar=new QueryProfile("morfar");
-        QueryProfile farfar=new QueryProfile("farfar");
+        QueryProfile barn = new QueryProfile("barn");
+        QueryProfile mor = new QueryProfile("mor");
+        QueryProfile far = new QueryProfile("far");
+        QueryProfile mormor = new QueryProfile("mormor");
+        QueryProfile morfar = new QueryProfile("morfar");
+        QueryProfile farfar = new QueryProfile("farfar");
         barn.addInherited(mor);
         barn.addInherited(far);
         mor.addInherited(mormor);
@@ -271,12 +271,12 @@ public class QueryProfileTestCase {
 
     @Test
     public void testListProperties() {
-        QueryProfile barn=new QueryProfile("barn");
-        QueryProfile mor=new QueryProfile("mor");
-        QueryProfile far=new QueryProfile("far");
-        QueryProfile mormor=new QueryProfile("mormor");
-        QueryProfile morfar=new QueryProfile("morfar");
-        QueryProfile farfar=new QueryProfile("farfar");
+        QueryProfile barn = new QueryProfile("barn");
+        QueryProfile mor = new QueryProfile("mor");
+        QueryProfile far = new QueryProfile("far");
+        QueryProfile mormor = new QueryProfile("mormor");
+        QueryProfile morfar = new QueryProfile("morfar");
+        QueryProfile farfar = new QueryProfile("farfar");
         barn.addInherited(mor);
         barn.addInherited(far);
         mor.addInherited(mormor);
@@ -325,26 +325,26 @@ public class QueryProfileTestCase {
     /** Tests that dots are followed when setting overridability */
     @Test
     public void testInstanceOverridable() {
-        QueryProfile profile=new QueryProfile("root/unoverridableIndex");
+        QueryProfile profile = new QueryProfile("root/unoverridableIndex");
         profile.set("model.defaultIndex","default", null);
-        profile.setOverridable("model.defaultIndex",false,null);
+        profile.setOverridable("model.defaultIndex", false,null);
 
         assertFalse(profile.isDeclaredOverridable("model.defaultIndex",null).booleanValue());
 
         // Parameters should be ignored
         Query query = new Query(HttpRequest.createTestRequest("?model.defaultIndex=title", Method.GET), profile.compile(null));
-        assertEquals("default",query.getModel().getDefaultIndex());
+        assertEquals("default", query.getModel().getDefaultIndex());
 
         // Parameters should be ignored
         query = new Query(HttpRequest.createTestRequest("?model.defaultIndex=title&model.language=de", Method.GET), profile.compile(null));
-        assertEquals("default",query.getModel().getDefaultIndex());
-        assertEquals("de",query.getModel().getLanguage().languageCode());
+        assertEquals("default", query.getModel().getDefaultIndex());
+        assertEquals("de", query.getModel().getLanguage().languageCode());
     }
 
     /** Tests that dots are followed when setting overridability...also with variants */
     @Test
     public void testInstanceOverridableWithVariants() {
-        QueryProfile profile=new QueryProfile("root/unoverridableIndex");
+        QueryProfile profile = new QueryProfile("root/unoverridableIndex");
         profile.setDimensions(new String[] {"x"});
         profile.set("model.defaultIndex","default", null);
         profile.setOverridable("model.defaultIndex",false,null);
@@ -353,12 +353,12 @@ public class QueryProfileTestCase {
 
         // Parameters should be ignored
         Query query = new Query(HttpRequest.createTestRequest("?x=x1&model.defaultIndex=title", Method.GET), profile.compile(null));
-        assertEquals("default",query.getModel().getDefaultIndex());
+        assertEquals("default", query.getModel().getDefaultIndex());
 
         // Parameters should be ignored
         query = new Query(HttpRequest.createTestRequest("?x=x1&model.default-index=title&model.language=de", Method.GET), profile.compile(null));
-        assertEquals("default",query.getModel().getDefaultIndex());
-        assertEquals("de",query.getModel().getLanguage().languageCode());
+        assertEquals("default", query.getModel().getDefaultIndex());
+        assertEquals("de", query.getModel().getLanguage().languageCode());
     }
 
     @Test
@@ -371,7 +371,7 @@ public class QueryProfileTestCase {
         assertFalse(profile.isDeclaredOverridable("a",null));
 
         Query query = new Query(HttpRequest.createTestRequest("?x=x1&a=overridden", Method.GET), profile.compile(null));
-        assertEquals("original",query.properties().get("a"));
+        assertEquals("original", query.properties().get("a"));
     }
 
     @Test
@@ -390,12 +390,12 @@ public class QueryProfileTestCase {
     /** Tests having both an explicit reference and an override */
     @Test
     public void testExplicitReferenceOverride() {
-        QueryProfile a1=new QueryProfile("a1");
+        QueryProfile a1 = new QueryProfile("a1");
         a1.set("b","a1.b", null);
-        QueryProfile profile=new QueryProfile("test");
+        QueryProfile profile = new QueryProfile("test");
         profile.set("a",a1, null);
         profile.set("a.b","a.b", null);
-        assertEquals("a.b",profile.compile(null).get("a.b"));
+        assertEquals("a.b", profile.compile(null).get("a.b"));
     }
 
     @Test
@@ -411,7 +411,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testSettingNonLeaf2() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.set("a.b","a.b-value", null);
         p.set("a","a-value", null);
 
@@ -422,7 +422,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testSettingNonLeaf3a() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.setDimensions(new String[] {"x"});
         p.set("a.b","a.b-value", null);
         p.set("a","a-value",new String[] {"x1"}, null);
@@ -437,7 +437,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testSettingNonLeaf3b() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.setDimensions(new String[] {"x"});
         p.set("a","a-value",new String[] {"x1"}, null);
         p.set("a.b","a.b-value", null);
@@ -452,7 +452,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testSettingNonLeaf4a() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.setDimensions(new String[] {"x"});
         p.set("a.b","a.b-value",new String[] {"x1"}, null);
         p.set("a","a-value", null);
@@ -466,7 +466,7 @@ public class QueryProfileTestCase {
     }
 
     public void testSettingNonLeaf4b() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.setDimensions(new String[] {"x"});
         p.set("a","a-value", (QueryProfileRegistry)null);
         p.set("a.b","a.b-value",new String[] {"x1"}, null);
@@ -481,7 +481,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testSettingNonLeaf5() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.setDimensions(new String[] {"x"});
         p.set("a.b","a.b-value",new String[] {"x1"}, null);
         p.set("a","a-value",new String[] {"x1"}, null);
@@ -496,7 +496,7 @@ public class QueryProfileTestCase {
 
     @Test
     public void testListingWithNonLeafs() {
-        QueryProfile p=new QueryProfile("test");
+        QueryProfile p = new QueryProfile("test");
         p.set("a","a-value", null);
         p.set("a.b","a.b-value", null);
         Map<String,Object> values = p.compile(null).listValues("a");
@@ -589,7 +589,7 @@ public class QueryProfileTestCase {
                                                           "clustering.enable=true&clustering.timeline.bucketspec=-" +
                                                           "7d/3h&clustering.timeline.tophit=false&clustering.timeli" +
                                                           "ne=true", Method.GET), p.compile(null));
-        assertEquals(true, q.properties().getBoolean("clustering.timeline", false));
+        assertTrue(q.properties().getBoolean("clustering.timeline", false));
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
index 3aa61fe8370..4f1f7d4b277 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
@@ -70,7 +70,6 @@ public class Upgrader extends Maintainer {
         cancelUpgradesOf(applications().with(UpgradePolicy.conservative).upgrading().failing().notUpgradingTo(conservativeTarget), reason);
 
         // Schedule the right upgrades
-
         canaryTarget.ifPresent(target -> upgrade(applications().with(UpgradePolicy.canary), target));
         defaultTarget.ifPresent(target -> upgrade(applications().with(UpgradePolicy.defaultPolicy), target));
         conservativeTarget.ifPresent(target -> upgrade(applications().with(UpgradePolicy.conservative), target));
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java
index e4bd35ca393..ec9d2e0df84 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java
@@ -26,8 +26,8 @@ import java.util.Map;
 public class Response {
 
     /**
-     * <p>This interface acts as a namespace for the built-in status codes of the jDISC core. These are identical to the
-     * common HTTP status codes (see <a href="http://www.rfc-editor.org/rfc/rfc2616.txt">RFC2616</a>).</p>
+     * This interface acts as a namespace for the built-in status codes of the jDISC core. These are identical to the
+     * common HTTP status codes (see <a href="http://www.rfc-editor.org/rfc/rfc2616.txt">RFC2616</a>).
      */
     public interface Status {
 
@@ -88,9 +88,7 @@ public class Response {
         int LOCKED = 423;
         int FAILED_DEPENDENCY = 424;
 
-        /**
-         * <p>5xx: Server Error - The server failed to fulfill an apparently valid request.</p>
-         */
+        /** 5xx: Server Error - The server failed to fulfill an apparently valid request. */
         int INTERNAL_SERVER_ERROR = 500;
         int NOT_IMPLEMENTED = 501;
         int BAD_GATEWAY = 502;
@@ -106,7 +104,7 @@ public class Response {
     private int status;
 
     /**
-     * <p>Creates a new instance of this class.</p>
+     * Creates a new instance of this class.
      *
      * @param status The status code to assign to this.
      */
@@ -115,7 +113,7 @@ public class Response {
     }
 
     /**
-     * <p>Creates a new instance of this class.</p>
+     * Creates a new instance of this class.
      *
      * @param status The status code to assign to this.
      * @param error  The error to assign to this.
@@ -217,4 +215,5 @@ public class Response {
     public static void dispatchTimeout(ResponseHandler handler) {
         ResponseDispatch.newInstance(Status.GATEWAY_TIMEOUT).dispatch(handler);
     }
+
 }
diff --git a/linguistics/src/main/java/com/yahoo/language/Language.java b/linguistics/src/main/java/com/yahoo/language/Language.java
index 655a9003fb1..59a5003e7fd 100644
--- a/linguistics/src/main/java/com/yahoo/language/Language.java
+++ b/linguistics/src/main/java/com/yahoo/language/Language.java
@@ -501,7 +501,7 @@ public enum Language {
         }
     }
 
-    private Language(String code) {
+    Language(String code) {
         this.code = code;
     }
 
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java
index 618c187be33..8c4ff3ae108 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java
@@ -300,7 +300,7 @@ class IOThread implements Runnable, AutoCloseable {
         return processResponse;
     }
 
-    private ThreadState cycle(final ThreadState threadState) {
+    private ThreadState cycle(ThreadState threadState) {
         switch(threadState) {
             case DISCONNECTED:
                 try {
@@ -359,7 +359,6 @@ class IOThread implements Runnable, AutoCloseable {
     }
 
     private void sleepIfProblemsGettingSyncedConnection(ThreadState newState, ThreadState oldState) {
-
         if (newState == ThreadState.SESSION_SYNCED) return;
         if (newState == ThreadState.CONNECTED && oldState == ThreadState.DISCONNECTED) return;
         try {
@@ -394,7 +393,7 @@ class IOThread implements Runnable, AutoCloseable {
             EndpointResult endpointResult = EndPointResultFactory.createTransientError(
                     endpoint, document.get().getOperationId(),
                     new Exception("Not sending document operation, timed out in queue after "
-                            + document.get().timeInQueueMillis() + " ms."));
+                                  + document.get().timeInQueueMillis() + " ms."));
             resultQueue.failOperation(endpointResult, clusterId);
         }
     }