Merge pull request #9037 from vespa-engine/bjorncs/bindings-cleanup

Bjorncs/bindings cleanup

7 files changed, 14 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 46acdb44746..d5e42276c1a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.admin.clustercontroller;
 
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.ComponentSpecification;
+import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
@@ -10,10 +11,8 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.config.content.FleetcontrollerConfig;
-import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.vespa.model.container.Container;
-import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.vespa.model.container.component.AccessLogComponent;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
@@ -21,6 +20,8 @@ import com.yahoo.vespa.model.container.component.Handler;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+
 /**
  * Container implementation for cluster-controllers
  */
@@ -87,8 +88,7 @@ public class ClusterControllerContainer extends Container implements
     }
 
     private void addHandler(Handler h, String binding) {
-        h.addServerBindings("http://*/" + binding,
-                            "https://*/" + binding);
+        h.addServerBindings("http://*/" + binding);
         super.addHandler(h);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index a370e0dc38b..446169c0ed2 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -212,9 +212,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         Handler<AbstractConfigProducer<?>> stateHandler = new Handler<>(
                 new ComponentModel(STATE_HANDLER_CLASS, null, null, null));
         stateHandler.addServerBindings("http://*" + StateHandler.STATE_API_ROOT,
-                                       "https://*" + StateHandler.STATE_API_ROOT,
-                                       "http://*" + StateHandler.STATE_API_ROOT + "/*",
-                                       "https://*" + StateHandler.STATE_API_ROOT + "/*");
+                                       "http://*" + StateHandler.STATE_API_ROOT + "/*");
         addComponent(stateHandler);
     }
 
@@ -242,13 +240,13 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         Handler<AbstractConfigProducer<?>> statusHandler = new Handler<>(
                 new ComponentModel(BundleInstantiationSpecification.getInternalHandlerSpecificationFromStrings(
                         APPLICATION_STATUS_HANDLER_CLASS, null), null));
-        statusHandler.addServerBindings("http://*/ApplicationStatus", "https://*/ApplicationStatus");
+        statusHandler.addServerBindings("http://*/ApplicationStatus");
         addComponent(statusHandler);
     }
 
     public void addVipHandler() {
         Handler<?> vipHandler = Handler.fromClassName(FileStatusHandlerComponent.CLASS);
-        vipHandler.addServerBindings("http://*/status.html", "https://*/status.html");
+        vipHandler.addServerBindings("http://*/status.html");
         addComponent(vipHandler);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java
index b7c8460a9a5..6b4f8d486ec 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java
@@ -49,9 +49,7 @@ public class ContainerModelEvaluation implements RankProfilesConfig.Producer, Ra
     public static Handler<?> getHandler() {
         Handler<?> handler = new Handler<>(new ComponentModel(REST_HANDLER_NAME, null, BUNDLE_NAME));
         handler.addServerBindings("http://*/" + REST_BINDING,
-                                  "https://*/" + REST_BINDING,
-                                  "http://*/" + REST_BINDING + "/*",
-                                  "https://*/" + REST_BINDING + "/*");
+                                  "http://*/" + REST_BINDING + "/*");
         return handler;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
index 4220a6571a0..071411845ad 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
@@ -153,6 +153,6 @@ public final class AccessControl {
     }
 
     private static Stream<String> servletBindings(Servlet servlet) {
-        return Stream.of("http://*/", "https://*/").map(protocol -> protocol + servlet.bindingPath);
+        return Stream.of("http://*/").map(protocol -> protocol + servlet.bindingPath);
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java
index 32f0f373a92..4fd79a4f335 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java
@@ -4,10 +4,6 @@ package com.yahoo.vespa.model.container.processing;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.component.chain.Chains;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Root config producer for processing
  *
@@ -15,7 +11,7 @@ import java.util.List;
  */
 public class ProcessingChains extends Chains<ProcessingChain> {
 
-    public static final String[] defaultBindings = new String[] {"http://*/processing/*", "https://*/processing/*"};
+    public static final String[] defaultBindings = new String[] {"http://*/processing/*"};
 
 
     public ProcessingChains(AbstractConfigProducer parent, String subId) {
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 6663dc0bbc0..7e80c6be221 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
@@ -271,7 +271,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             Optional<String> statusFile = Optional.ofNullable(System.getenv(HOSTED_VESPA_STATUS_FILE_SETTING));
             cluster.addComponent(
                     new FileStatusHandlerComponent(name + "-status-handler", statusFile.orElse(HOSTED_VESPA_STATUS_FILE),
-                            "http://*/" + name, "https://*/" + name));
+                            "http://*/" + name));
         } else {
             cluster.addVipHandler();
         }
@@ -712,7 +712,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         ProcessingHandler<SearchChains> searchHandler = new ProcessingHandler<>(
                 cluster.getSearch().getChains(), "com.yahoo.search.handler.SearchHandler");
 
-        String[] defaultBindings = {"http://*/search/*", "https://*/search/*"};
+        String[] defaultBindings = {"http://*/search/*"};
         for (String binding: serverBindings(searchElement, defaultBindings)) {
             searchHandler.addServerBindings(binding);
         }
@@ -722,7 +722,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     private void addGUIHandler(ApplicationContainerCluster cluster) {
         Handler<?> guiHandler = new GUIHandler();
-        guiHandler.addServerBindings("http://"+GUIHandler.BINDING, "https://"+GUIHandler.BINDING);
+        guiHandler.addServerBindings("http://"+GUIHandler.BINDING);
         cluster.addComponent(guiHandler);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
index a44f5440a9f..10e24a609f7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
@@ -18,7 +18,7 @@ import java.util.logging.Logger;
 public class DocumentApiOptionsBuilder {
 
     private static final Logger log = Logger.getLogger(DocumentApiOptionsBuilder.class.getName());
-    private static final String[] DEFAULT_BINDINGS = {"http://*/", "https://*/"};
+    private static final String[] DEFAULT_BINDINGS = {"http://*/"};
 
     public static ContainerDocumentApi.Options build(Element spec) {
         return new ContainerDocumentApi.Options(