Merge pull request #8586 from vespa-engine/arnej/cleanup-configserver-spec

remove unused code and simplify

6 files changed, 58 insertions, 71 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index f93688abddc..378c262cd72 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -73,7 +73,7 @@ public class TestProperties implements ModelContext.Properties {
         return this;
     }
 
-    public TestProperties setConfigServerSpecs(List<Configserver.Spec> configServerSpecs) {
+    public TestProperties setConfigServerSpecs(List<Spec> configServerSpecs) {
         this.configServerSpecs = ImmutableList.copyOf(configServerSpecs);
         return this;
     }
@@ -82,4 +82,55 @@ public class TestProperties implements ModelContext.Properties {
         this.useDedicatedNodeForLogserver = useDedicatedNodeForLogserver;
         return this;
     }
+
+    public static class Spec implements ConfigServerSpec {
+
+        private final String hostName;
+        private final int configServerPort;
+        private final int httpPort;
+        private final int zooKeeperPort;
+
+        public String getHostName() {
+            return hostName;
+        }
+
+        public int getConfigServerPort() {
+            return configServerPort;
+        }
+
+        public int getHttpPort() {
+            return httpPort;
+        }
+
+        public int getZooKeeperPort() {
+            return zooKeeperPort;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof ConfigServerSpec) {
+                ConfigServerSpec other = (ConfigServerSpec)o;
+
+                return hostName.equals(other.getHostName()) &&
+                        configServerPort == other.getConfigServerPort() &&
+                        httpPort == other.getHttpPort() &&
+                        zooKeeperPort == other.getZooKeeperPort();
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return hostName.hashCode();
+        }
+
+        public Spec(String hostName, int configServerPort, int httpPort, int zooKeeperPort) {
+            this.hostName = hostName;
+            this.configServerPort = configServerPort;
+            this.httpPort = httpPort;
+            this.zooKeeperPort = zooKeeperPort;
+        }
+    }
+
 }
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 50e9e29a6d9..c2f2fb61f4f 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
@@ -103,14 +103,6 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         return configservers;
     }
 
-    public List<ConfigServerSpec> getConfigServerSpecs() {
-        List<ConfigServerSpec> serverSpecs = new ArrayList<>();
-        for (Configserver server : getConfigservers()) {
-            serverSpecs.add(server.getConfigServerSpec());
-        }
-        return serverSpecs;
-    }
-
     public void removeSlobroks() { slobroks.clear(); }
 
     /** Returns an immutable list of the slobroks in this */
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 a2839ec0fb6..2645b6cd59d 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
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin;
 
-import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
 
@@ -74,64 +73,10 @@ public class Configserver extends AbstractService {
         return getRelativePort(1);
     }
 
-    ConfigServerSpec getConfigServerSpec() {
-        return new Spec(getHostName(), getConfigServerRpcPort(), getConfigServerHttpPort(), ZooKeepersConfigProvider.zkPort);
-    }
-
     @Override
     public int getHealthPort()  {
         return getRelativePort(1);
     }
 
-    // TODO: Remove this implementation when we are on Hosted Vespa.
-    public static class Spec implements ConfigServerSpec {
-
-        private final String hostName;
-        private final int configServerPort;
-        private final int httpPort;
-        private final int zooKeeperPort;
-
-        public String getHostName() {
-            return hostName;
-        }
-
-        public int getConfigServerPort() {
-            return configServerPort;
-        }
-
-        public int getHttpPort() {
-            return httpPort;
-        }
-
-        public int getZooKeeperPort() {
-            return zooKeeperPort;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (o instanceof ConfigServerSpec) {
-                ConfigServerSpec other = (ConfigServerSpec)o;
-
-                return hostName.equals(other.getHostName()) &&
-                        configServerPort == other.getConfigServerPort() &&
-                        httpPort == other.getHttpPort() &&
-                        zooKeeperPort == other.getZooKeeperPort();
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return hostName.hashCode();
-        }
-
-        public Spec(String hostName, int configServerPort, int httpPort, int zooKeeperPort) {
-            this.hostName = hostName;
-            this.configServerPort = configServerPort;
-            this.httpPort = httpPort;
-            this.zooKeeperPort = zooKeeperPort;
-        }
-    }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
index 143df20d557..be3ec8a6a14 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
@@ -28,9 +28,7 @@ public class ZooKeepersConfigProvider implements ZookeepersConfig.Producer {
     public List<String> getZooKeepers() {
         List<String> servers = new ArrayList<>();
         for (Configserver server : configServers) {
-            ConfigServerSpec serverSpec = server.getConfigServerSpec();
-            servers.add(serverSpec.getHostName() + ":" + serverSpec.getZooKeeperPort());
-
+            servers.add(server.getHostName() + ":" + zkPort);
         }
         return servers;
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
index d7861a6f284..f4fb3ac5247 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
@@ -6,6 +6,7 @@ import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.admin.*;
@@ -115,9 +116,9 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
     @Test
     public void multitenant() {
         List<ConfigServerSpec> configServerSpecs = Arrays.asList(
-                new Configserver.Spec("test1", 19070, 19071, 2181),
-                new Configserver.Spec("test2", 19070, 19071, 2181),
-                new Configserver.Spec("test3", 19070, 19071, 2181));
+                new TestProperties.Spec("test1", 19070, 19071, 2181),
+                new TestProperties.Spec("test2", 19070, 19071, 2181),
+                new TestProperties.Spec("test3", 19070, 19071, 2181));
         Admin admin = buildAdmin(servicesMultitenantAdminOnly(), true, configServerSpecs);
         assertThat(admin.getConfigservers().size(), is(3));
         assertThat(admin.getSlobroks().size(), is(1));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index 5d842c6651c..14659494780 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -280,7 +280,7 @@ public class VespaModelTestCase {
                 .applicationPackage(applicationPackage)
                 .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com"))
                 .properties(new TestProperties()
-                        .setConfigServerSpecs(Arrays.asList(new Configserver.Spec("cfghost", 1234, 1235, 1236)))
+                        .setConfigServerSpecs(Arrays.asList(new TestProperties.Spec("cfghost", 1234, 1235, 1236)))
                         .setMultitenant(true))
                 .build();
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);