Remove duplicated method and move setting of enabled flags for rpc and http

2 files changed, 5 insertions, 9 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 447c14e2561..442d6bbf368 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
@@ -247,7 +247,7 @@ public class Container extends AbstractService implements
      */
     public int getPortCount() {
         int httpPorts = (getHttp() != null) ? 0 : numHttpServerPorts + 2; // TODO remove +2, only here to keep irrelevant unit tests from failing.
-        int rpcPorts = (isRpcServerEnabled()) ? numRpcServerPorts : 0;
+        int rpcPorts = (rpcServerEnabled()) ? numRpcServerPorts : 0;
         return httpPorts + rpcPorts;
     }
 
@@ -263,7 +263,7 @@ public class Container extends AbstractService implements
     }
 
     private int getRpcPort() {
-        return isRpcServerEnabled() ? getRelativePort(numHttpServerPorts + 1) : 0;
+        return rpcServerEnabled() ? getRelativePort(numHttpServerPorts + 1) : 0;
     }
 
     private int getMessagingPort() {
@@ -289,15 +289,11 @@ public class Container extends AbstractService implements
         return "PRELOAD=" + getPreLoad() + " exec vespa-start-container-daemon " + getJvmArgs() + " ";
     }
 
-    private boolean isRpcServerEnabled() {
-        return ((ContainerCluster) parent).rpcServerEnabled();
-    }
-
     @Override
     public void getConfig(QrConfig.Builder builder) {
         builder.
                 rpc(new Rpc.Builder()
-                        .enabled(isRpcServerEnabled())
+                        .enabled(rpcServerEnabled())
                         .port(getRpcPort())
                         .slobrokId(serviceSlobrokId())).
                 filedistributor(filedistributorConfig());
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 8cae7808c5b..372b3b146a1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -126,6 +126,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         ContainerCluster cluster = createContainerCluster(spec, modelContext);
         addClusterContent(cluster, spec, modelContext);
         addBundlesForPlatformComponents(cluster);
+        cluster.setRpcServerEnabled(rpcServerEnabled);
+        cluster.setHttpServerEnabled(httpServerEnabled);
         model.setCluster(cluster);
     }
 
@@ -174,8 +176,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         addLegacyFilters(spec, cluster);  // TODO: Remove for Vespa 7
 
         addAthensCopperArgos(cluster, context);  // Must be added after nodes.
-        cluster.setRpcServerEnabled(rpcServerEnabled);
-        cluster.setHttpServerEnabled(httpServerEnabled);
     }
 
     private void addSecretStore(ContainerCluster cluster, Element spec) {