Do not use RestrictedServerCnxnFactory

Do not use it for self-hosted, feature cannot be supported
with ZooKeeper 3.5 (but secure communications can be setup with
ZooKeeper 3.5, which is supported from that version on)

1 files changed, 2 insertions, 5 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index d82859e4df2..b4d889a4598 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -59,7 +59,6 @@ public class ConfigserverClusterTest {
         assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::hostname, "cfg1", "localhost", "cfg3");
         assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::id, 4, 2, 3);
         assertEquals(2, config.myid());
-        assertFalse(config.useRestrictedServerCnxnFactory());
     }
 
     @Test
@@ -70,7 +69,6 @@ public class ConfigserverClusterTest {
         assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::hostname, "cfg1", "localhost", "cfg3");
         assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::id, 4, 2, 3);
         assertEquals(2, config.myid());
-        assertTrue(config.useRestrictedServerCnxnFactory());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -124,13 +122,12 @@ public class ConfigserverClusterTest {
 
     @SuppressWarnings("varargs")
     private static <T> void assertZookeeperServerProperty(
-            List<ZookeeperServerConfig.Server> zkServers, Function<ZookeeperServerConfig.Server, T> properyMapper, T... expectedProperties) {
-        List<T> actualPropertyValues = zkServers.stream().map(properyMapper).collect(Collectors.toList());
+            List<ZookeeperServerConfig.Server> zkServers, Function<ZookeeperServerConfig.Server, T> propertyMapper, T... expectedProperties) {
+        List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).collect(Collectors.toList());
         List<T> expectedPropertyValues = Arrays.asList(expectedProperties);
         assertEquals(expectedPropertyValues, actualPropertyValues);
     }
 
-
     private static TestOptions createTestOptions(List<String> configServerHostnames, List<Integer> configServerZkIds) {
         return createTestOptions(configServerHostnames, configServerZkIds, true);