summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/config
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-09 09:37:12 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-09 09:37:12 +0100
commit28d393fde0efe435a8dfa6dade5a4644989cb4c3 (patch)
treebde315f1a244ca96dec8637716507bf7e1016499 /config-model/src/main/java/com/yahoo/config
parent919fd85dae2ed0de98b8a336755d9cf5fc66a6d1 (diff)
Improve file distribution error message
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java4
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java9
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java2
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java2
4 files changed, 6 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index aede68a1dd1..1cc5c93c28a 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -223,7 +223,7 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
@Override
public void getConfig(ModelConfig.Builder builder) {
builder.vespaVersion(vespaVersion.toFullString());
- for (HostResource modelHost : getHostSystem().getHosts()) {
+ for (HostResource modelHost : hostSystem().getHosts()) {
builder.hosts(new Hosts.Builder()
.name(modelHost.getHostname())
.services(getServices(modelHost))
@@ -278,7 +278,7 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
}
@Override
- public HostSystem getHostSystem() {
+ public HostSystem hostSystem() {
return hostSystem;
}
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
index c2834847423..48c21f370f4 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
@@ -265,13 +265,8 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce
}
}
- /**
- * Returns the one and only HostSystem of the root node
- * Must be overridden by root node.
- */
- public HostSystem getHostSystem() {
- return getRoot().getHostSystem();
- }
+ /** Returns the one and only HostSystem of the root node. Must be overridden by root node. */
+ public HostSystem hostSystem() { return getRoot().hostSystem(); }
public AbstractConfigProducerRoot getRoot() {
return parent == null ? null : parent.getRoot();
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
index 74ab4504136..13f271ebe9d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
@@ -123,7 +123,7 @@ public class MockRoot extends AbstractConfigProducerRoot {
return fileDistributor;
}
- public HostSystem getHostSystem() {
+ public HostSystem hostSystem() {
return hostSystem;
}
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java
index 25c97cba04b..81f5d303d56 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/TestRoot.java
@@ -61,6 +61,6 @@ public class TestRoot {
* @return A list of hosts.
*/
public List<HostResource> getHosts() {
- return model.getHostSystem().getHosts();
+ return model.hostSystem().getHosts();
}
}