Merge pull request #26251 from vespa-engine/hmusum/config-model-cleanup-5

Hmusum/config model cleanup 5

4 files changed, 0 insertions, 47 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
index b351073bd25..5ea22ee4d25 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
@@ -36,9 +36,6 @@ public class Hosts {
         for (Host host : hosts)
             hostsBuilder.put(host.hostname(), host);
         this.hosts = hostsBuilder.build();
-
-        // Don't limit zk connections on non-hosted systems
-        System.setProperty("zookeeper.vespa.clients", "");
     }
 
     /** Throw IllegalArgumentException if host aliases breaks invariants */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientProviderBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientProviderBuilder.java
deleted file mode 100644
index 3491f219a8e..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientProviderBuilder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright Yahoo. 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.deploy.DeployState;
-import com.yahoo.config.model.producer.AnyConfigProducer;
-import com.yahoo.config.model.producer.TreeConfigProducer;
-import com.yahoo.text.XML;
-import com.yahoo.vespa.model.container.ApplicationContainerCluster;
-import com.yahoo.vespa.model.container.component.Handler;
-import com.yahoo.vespa.model.container.component.UserBindingPattern;
-import org.w3c.dom.Element;
-
-/**
- * @author gjoranv
- * @since 5.1.6
- */
-public class DomClientProviderBuilder extends DomHandlerBuilder {
-
-    public DomClientProviderBuilder(ApplicationContainerCluster cluster) {
-        super(cluster);
-    }
-
-    @Override
-    protected Handler doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> parent, Element clientElement) {
-        Handler client = createHandler(clientElement);
-
-        for (Element binding : XML.getChildren(clientElement, "binding"))
-            client.addClientBindings(UserBindingPattern.fromPattern(XML.getValue(binding)));
-
-        for (Element serverBinding : XML.getChildren(clientElement, "serverBinding"))
-            client.addServerBindings(UserBindingPattern.fromPattern(XML.getValue(serverBinding)));
-
-        DomComponentBuilder.addChildren(deployState, parent, clientElement, client);
-
-        return client;
-    }
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index 8398df6f5ac..07e879f0e9c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.builder.xml.dom;
 
 import ai.vespa.validation.Validation;
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.ApplicationConfigProducerRoot;
 import com.yahoo.config.model.ConfigModelRepo;
 import com.yahoo.config.model.builder.xml.XmlHelper;
@@ -24,12 +23,8 @@ import com.yahoo.vespa.model.container.docproc.ContainerDocproc;
 import com.yahoo.vespa.model.content.Content;
 import com.yahoo.vespa.model.search.SearchCluster;
 import org.w3c.dom.Element;
-
-import java.util.HashSet;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
index 05b8681b5fa..d92fea24d51 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
@@ -70,8 +70,6 @@ public class HostsXmlProvisionerTest {
         assertEquals(3, map.size());
         assertCorrectNumberOfHosts(map, 3);
         assertTrue(map.keySet().containsAll(aliases));
-
-        assertEquals("", System.getProperty("zookeeper.vespa.clients"));
     }
 
     @Test