Rename variable and rename and simplify methods for getting hosts

6 files changed, 18 insertions, 26 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Host.java b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
index 78e0a472e13..f3c2e75b356 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Host.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
@@ -19,7 +19,7 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?>
 
     private ConfigSentinel configSentinel = null;
     private final String hostname;
-    private final boolean multitenant;
+    private final boolean runsConfigServer;
 
     /**
      * Constructs a new Host instance.
@@ -31,10 +31,10 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?>
         this(parent, hostname, false);
     }
 
-    private Host(AbstractConfigProducer parent, String hostname, boolean multitenant) {
+    private Host(AbstractConfigProducer parent, String hostname, boolean runsConfigServer) {
         super(parent, hostname);
         Objects.requireNonNull(hostname, "The host name of a host cannot be null");
-        this.multitenant = multitenant;
+        this.runsConfigServer = runsConfigServer;
         this.hostname = hostname;
         if (parent instanceof HostSystem) {            
             checkName((HostSystem) parent, hostname);            
@@ -58,7 +58,7 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?>
         }
     }
 
-    public static Host createMultitenantHost(AbstractConfigProducer parent, String hostname) {
+    public static Host createConfigServerHost(AbstractConfigProducer parent, String hostname) {
         return new Host(parent, hostname, true);
     }
 
@@ -67,15 +67,15 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?>
         super(parent, "testhost");
         hostname = "testhost";
         configSentinel = null;
-        multitenant = false;
+        runsConfigServer = false;
     }
 
     public String getHostName() {
         return hostname;
     }
 
-    public boolean isMultitenant() {
-        return multitenant;
+    public boolean runsConfigServer() {
+        return runsConfigServer;
     }
 
     /** Returns the string representation of this Host object. */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
index b9698c21da0..a023d8c03db 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
@@ -147,10 +147,10 @@ public class HostSystem extends AbstractConfigProducer<Host> {
         return hostResource;
     }
 
-    /** Returns the hosts owned by the application having this system - i.e all hosts except shared ones */
+    /** Returns the hosts owned by the application having this system - i.e all hosts except config servers */
     public List<HostResource> getHosts() {
         return hostname2host.values().stream()
-                .filter(host -> !host.getHost().isMultitenant())
+                .filter(host -> !host.getHost().runsConfigServer())
                 .collect(Collectors.toList());
     }
 
@@ -187,9 +187,8 @@ public class HostSystem extends AbstractConfigProducer<Host> {
         hostname2host.put(host.getHostName(), host);
     }
 
-    Set<HostSpec> getSingleTenantHosts() {
-        return hostname2host.values().stream()
-                .filter(host -> ! host.getHost().isMultitenant())
+    Set<HostSpec> getHostSpecs() {
+        return getHosts().stream()
                 .map(host -> new HostSpec(host.getHostName(), Collections.emptyList(),
                                           host.getFlavor(), host.primaryClusterMembership()))
                 .collect(Collectors.toCollection(LinkedHashSet::new));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 8ad609775f2..02f2a97f9ff 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -60,6 +60,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import static com.yahoo.text.StringUtilities.quote;
 
@@ -166,7 +167,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     }
 
     private ProvisionInfo createProvisionInfo() {
-        return ProvisionInfo.withHosts(root.getHostSystem().getSingleTenantHosts());
+        return ProvisionInfo.withHosts(root.getHostSystem().getHostSpecs());
     }
 
     private void validateWrapExceptions() {
@@ -197,13 +198,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     /** Return a collection of all hostnames used in this application */
     @Override
     public Set<HostInfo> getHosts() {
-        Set<HostInfo> hosts = new LinkedHashSet<>();
-        for (HostResource host : root.getHostSystem().getHosts()) {
-            if (!host.getHost().isMultitenant()) {
-                hosts.add(host.getHostInfo());
-            }
-        }
-        return hosts;
+        return root.getHostSystem().getHosts().stream().map(HostResource::getHostInfo).collect(Collectors.toSet());
     }
 
     public FileDistributor getFileDistributor() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index a9cc81a538a..06b20910675 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -175,7 +175,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         if (slobroks.isEmpty()) // TODO: Move to caller
             slobroks.addAll(createDefaultSlobrokSetup());
         for (HostResource host : hosts) {
-            if (!host.getHost().isMultitenant()) {
+            if (!host.getHost().runsConfigServer()) {
                 addCommonServices(host, properties);
             }
         }
@@ -238,7 +238,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         int n = 0;
         while ((n < hosts.size()) && (slobs.size() < 3)) {
             HostResource host = hosts.get(n);
-            if ((logserver== null || host != logserver.getHostResource()) && ! host.getHost().isMultitenant()) {
+            if ((logserver== null || host != logserver.getHostResource()) && ! host.getHost().runsConfigServer()) {
                 Slobrok newSlobrok = new Slobrok(this, slobs.size());
                 addAndInitializeService(host, newSlobrok);
                 slobs.add(newSlobrok);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
index 47332b064da..b2c2510ce22 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
@@ -26,7 +26,7 @@ import com.yahoo.vespa.model.AbstractService;
  */
 public class Configserver extends AbstractService {
     private static final long serialVersionUID = 1L;
-    public static final int defaultPort = 19070;
+    private static final int defaultPort = 19070;
     private static final Logger log = Logger.getLogger(Configserver.class.getName());
 
     public Configserver(AbstractConfigProducer parent, String name) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index 0a433cbc122..6970ca9b6b2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.builder.xml.dom;
 
-import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.ConfigModelContext.ApplicationType;
 import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
@@ -13,7 +12,6 @@ import com.yahoo.vespa.model.admin.*;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
 import com.yahoo.vespa.model.admin.monitoring.Yamas;
 import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
-import com.yahoo.vespa.model.admin.monitoring.builder.PredefinedMetricSets;
 import com.yahoo.vespa.model.admin.monitoring.builder.xml.MetricsBuilder;
 import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
 import com.yahoo.config.application.api.FileRegistry;
@@ -51,7 +49,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
         List<Configserver> configservers = new ArrayList<>();
         for (ConfigServerSpec spec : configServerSpecs) {
             HostSystem hostSystem = parent.getHostSystem();
-            HostResource host = new HostResource(Host.createMultitenantHost(hostSystem, spec.getHostName()));
+            HostResource host = new HostResource(Host.createConfigServerHost(hostSystem, spec.getHostName()));
             hostSystem.addBoundHost(host);
             Configserver configserver = new Configserver(parent, spec.getHostName());
             configserver.setHostResource(host);