Revert "Adding handler and binding when services.xml has <search>-field"

3 files changed, 0 insertions, 65 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java
deleted file mode 100644
index 025075be8fd..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.container.search;
-
-import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.osgi.provider.model.ComponentModel;
-import com.yahoo.vespa.model.container.component.Handler;
-
-
-/**
- * @author  Henrik Høiness
- */
-
-public class GUIHandler extends Handler<AbstractConfigProducer<?>> {
-        public static final String BUNDLE = "container-search-gui";
-        public static final String CLASS = "com.yahoo.search.query.gui.GUIHandler";
-        public static final String BINDING = "*/querybuilder/*";
-
-        public GUIHandler() {
-            super(new ComponentModel(bundleSpec(CLASS, BUNDLE)));
-        }
-
-        public static BundleInstantiationSpecification bundleSpec(String className, String bundle) {
-            return BundleInstantiationSpecification.getFromStrings(className, className, bundle);
-        }
-
-}
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 d81026c54d1..a007c4765c0 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
@@ -23,7 +23,6 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.config.MetricDefaultsConfig;
-import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.search.rendering.RendererRegistry;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.defaults.Defaults;
@@ -48,7 +47,6 @@ import com.yahoo.vespa.model.container.IdentityProvider;
 import com.yahoo.vespa.model.container.SecretStore;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.FileStatusHandlerComponent;
-import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.chain.ProcessingHandler;
 import com.yahoo.vespa.model.container.docproc.ContainerDocproc;
 import com.yahoo.vespa.model.container.docproc.DocprocChains;
@@ -57,7 +55,6 @@ import com.yahoo.vespa.model.container.http.xml.HttpBuilder;
 import com.yahoo.vespa.model.container.jersey.xml.RestApiBuilder;
 import com.yahoo.vespa.model.container.processing.ProcessingChains;
 import com.yahoo.vespa.model.container.search.ContainerSearch;
-import com.yahoo.vespa.model.container.search.GUIHandler;
 import com.yahoo.vespa.model.container.search.PageTemplates;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.container.search.SemanticRules;
@@ -381,7 +378,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             cluster.setSearch(buildSearch(cluster, searchElement, queryProfiles, semanticRules));
 
             addSearchHandler(cluster, searchElement);
-            addGUIHandler(cluster);
             validateAndAddConfiguredComponents(cluster, searchElement, "renderer", ContainerModelBuilder::validateRendererElement);
         }
     }
@@ -674,13 +670,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         cluster.addComponent(searchHandler);
     }
 
-    private void addGUIHandler(ContainerCluster cluster) {
-        Handler<?> guiHandler = new GUIHandler();
-        guiHandler.addServerBindings("http://"+GUIHandler.BINDING, "https://"+GUIHandler.BINDING);
-        cluster.addComponent(guiHandler);
-    }
-
-
     private String[] serverBindings(Element searchElement, String... defaultBindings) {
         List<Element> bindings = XML.getChildren(searchElement, "binding");
         if (bindings.isEmpty())
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 30f1df6a394..cc8733fc9e2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -8,8 +8,6 @@ import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.component.Handler;
-import com.yahoo.vespa.model.container.search.GUIHandler;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
@@ -34,31 +32,6 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         return root.getConfig(ChainsConfig.class, "default/component/com.yahoo.search.handler.SearchHandler");
     }
 
-    @Test
-    public void gui_search_handler_is_always_included_when_search_is_specified() throws Exception{
-        Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
-                "  <search />",
-                nodesXml,
-                "</jdisc>");
-
-        createModel(root, clusterElem);
-
-        String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, containsString(GUIHandler.BINDING));
-
-        ContainerCluster cluster = (ContainerCluster)root.getChildren().get("default");
-
-        GUIHandler guiHandler = null;
-        for (Handler<?> handler : cluster.getHandlers()) {
-            if (handler instanceof GUIHandler) {
-                guiHandler = (GUIHandler) handler;
-            }
-        }
-        if (guiHandler == null) fail();
-    }
-
-
 
     @Test
     public void search_handler_bindings_can_be_overridden() throws Exception {