diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-05-13 15:53:53 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-13 15:53:53 +0200 |
| commit | f05f428ccdef7a916fd90f247315784eb5dff05c (patch) | |
| tree | dd852fd4c2264f5bbabd5eb6e8dc13e1151b8683 /config-model | |
| parent | 705b8d9f0f4631bf7c953ae996190cb4d886039a (diff) | |
Non-functional changes only
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 8 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>" + |