Non-functional changes only

8 files changed, 15 insertions, 14 deletions

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 31c8724d634..c6de198c06a 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
@@ -46,7 +46,7 @@ import static com.yahoo.container.QrConfig.Rpc;
  * @author Einar M R Rosenvinge
  * @author Tony Vaagenes
  */
-//qr is restart because it is handled by ConfiguredApplication.start
+// qr is restart because it is handled by ConfiguredApplication.start
 @RestartConfigs({QrStartConfig.class, QrConfig.class})
 public abstract class Container extends AbstractService implements
         QrConfig.Producer,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java
index 4d9ba2f920e..fd0797d6098 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java
@@ -22,12 +22,7 @@ public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBu
 
     @Override
     protected ApplicationContainer doBuild(DeployState deployState, AbstractConfigProducer parent, Element nodeElem) {
-        return new ApplicationContainer(
-                parent,
-                id,
-                index,
-                deployState.isHosted()
-        );
+        return new ApplicationContainer(parent, id, index, deployState.isHosted());
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 15966694f8d..ca3198637f3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -667,7 +667,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         String servicesXml =
                 "<services>" +
                         "<admin version='3.0'>" +
-                        "    <nodes count='1'/>" +
+                        "    <nodes count='2'/>" +
                         "</admin>" +
                         "<container id ='default' version='1.0'>" +
                         "  <nodes>" +
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java
index d8fec35633b..dcdd1767c9c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-di/src/main/java/com/yahoo/container/di/Container.java
@@ -140,7 +140,7 @@ public class Container {
             snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration, restartOnRedeploy);
 
             log.log(FINE, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n",
-                    graph.configKeys(), graph.generation(), snapshot));
+                                        graph.configKeys(), graph.generation(), snapshot));
 
             if (snapshot instanceof BootstrapConfigs) {
                 if (getBootstrapGeneration() <= previousConfigGeneration) {
@@ -182,7 +182,7 @@ public class Container {
     }
 
     private ComponentGraph createAndConfigureComponentsGraph(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> componentsConfigs,
-            Injector fallbackInjector) {
+                                                             Injector fallbackInjector) {
         ComponentGraph componentGraph = createComponentsGraph(componentsConfigs, getComponentsGeneration(), fallbackInjector);
         componentGraph.setAvailableConfigs(componentsConfigs);
         return componentGraph;
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
index fdaaf4b698d..2e4db01fb1b 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
@@ -142,8 +142,7 @@ public class ComponentGraph {
     }
 
     public void setAvailableConfigs(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configs) {
-        Map<ConfigKey<ConfigInstance>, ConfigInstance> invariantMap = Keys.invariantCopy(configs);
-        componentNodes().forEach(node -> node.setAvailableConfigs(invariantMap));
+        componentNodes().forEach(node -> node.setAvailableConfigs(Keys.invariantCopy(configs)));
     }
 
     public void reuseNodes(ComponentGraph old) {
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 2a72d0b3442..d600b9d3e04 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -9,6 +9,7 @@ import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.concurrent.DaemonThreadFactory;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.subscription.ConfigInterruptedException;
+import com.yahoo.config.subscription.ConfigSubscriber;
 import com.yahoo.container.Container;
 import com.yahoo.container.QrConfig;
 import com.yahoo.container.core.ChainsConfig;
@@ -216,8 +217,7 @@ public final class ConfiguredApplication implements Application {
     }
 
     private <T extends ConfigInstance> T getConfig(Class<T> configClass) {
-        Subscriber subscriber = subscriberFactory.getSubscriber(
-                Collections.singleton(new ConfigKey<>(configClass, configId)));
+        Subscriber subscriber = subscriberFactory.getSubscriber(Collections.singleton(new ConfigKey<>(configClass, configId)));
         try {
             subscriber.waitNextGeneration();
             return configClass.cast(first(subscriber.config().values()));
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java b/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java
index e7a06560532..9e69390acd4 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java
@@ -4,7 +4,9 @@ package com.yahoo.vespaxmlparser;
 import com.yahoo.document.TestAndSetCondition;
 
 public class ConditionalFeedOperation extends FeedOperation {
+
     private final TestAndSetCondition condition;
+
     protected ConditionalFeedOperation(Type type) {
         super(type);
         this.condition = TestAndSetCondition.NOT_PRESENT_CONDITION;
@@ -18,4 +20,5 @@ public class ConditionalFeedOperation extends FeedOperation {
     public TestAndSetCondition getCondition() {
         return condition;
     }
+
 }
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java b/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java
index f3ddbc9196c..408741e64f4 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java
@@ -5,7 +5,9 @@ import com.yahoo.document.Document;
 import com.yahoo.document.TestAndSetCondition;
 
 public class DocumentFeedOperation extends ConditionalFeedOperation {
+
     private final Document document;
+
     public DocumentFeedOperation(Document document) {
         super(Type.DOCUMENT);
         this.document = document;
@@ -20,4 +22,6 @@ public class DocumentFeedOperation extends ConditionalFeedOperation {
     public Document getDocument() {
         return document;
     }
+
 }
+