Remove logging on https scheme from FilterBinding

This warning is now produced by UriBindingsValidator

4 files changed, 13 insertions, 27 deletions

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 a8ed10e8542..9054549ba22 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
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.container.http;
 
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.BindingPattern;
@@ -47,11 +46,9 @@ public final class AccessControl {
         private final Set<BindingPattern> excludeBindings = new LinkedHashSet<>();
         private Collection<Handler<?>> handlers = Collections.emptyList();
         private Collection<Servlet> servlets = Collections.emptyList();
-        private final DeployLogger logger;
 
-        public Builder(String domain, DeployLogger logger) {
+        public Builder(String domain) {
             this.domain = domain;
-            this.logger = logger;
         }
 
         public Builder readEnabled(boolean readEnabled) {
@@ -77,7 +74,7 @@ public final class AccessControl {
 
         public AccessControl build() {
             return new AccessControl(domain, writeEnabled, readEnabled,
-                                     excludeBindings, servlets, handlers, logger);
+                                     excludeBindings, servlets, handlers);
         }
     }
 
@@ -87,22 +84,19 @@ public final class AccessControl {
     private final Set<BindingPattern> excludedBindings;
     private final Collection<Handler<?>> handlers;
     private final Collection<Servlet> servlets;
-    private final DeployLogger logger;
 
     private AccessControl(String domain,
                           boolean writeEnabled,
                           boolean readEnabled,
                           Set<BindingPattern> excludedBindings,
                           Collection<Servlet> servlets,
-                          Collection<Handler<?>> handlers,
-                          DeployLogger logger) {
+                          Collection<Handler<?>> handlers) {
         this.domain = domain;
         this.readEnabled = readEnabled;
         this.writeEnabled = writeEnabled;
         this.excludedBindings = Collections.unmodifiableSet(excludedBindings);
         this.handlers = handlers;
         this.servlets = servlets;
-        this.logger = logger;
     }
 
     public List<FilterBinding> getBindings() {
@@ -118,14 +112,14 @@ public final class AccessControl {
         return handlers.stream()
                         .filter(this::shouldHandlerBeProtected)
                         .flatMap(handler -> handler.getServerBindings().stream())
-                        .map(binding -> accessControlBinding(binding, logger));
+                        .map(binding -> accessControlBinding(binding));
     }
 
     private Stream<FilterBinding> getServletBindings() {
         return servlets.stream()
                 .filter(this::shouldServletBeProtected)
                 .flatMap(AccessControl::servletBindings)
-                .map(binding -> accessControlBinding(binding, logger));
+                .map(binding -> accessControlBinding(binding));
     }
 
     private boolean shouldHandlerBeProtected(Handler<?> handler) {
@@ -141,8 +135,8 @@ public final class AccessControl {
         return servletBindings(servlet).noneMatch(excludedBindings::contains);
     }
 
-    private static FilterBinding accessControlBinding(BindingPattern binding, DeployLogger logger) {
-        return FilterBinding.create(new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), binding, logger);
+    private static FilterBinding accessControlBinding(BindingPattern binding) {
+        return FilterBinding.create(new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), binding);
     }
 
     private static Stream<BindingPattern> servletBindings(Servlet servlet) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterBinding.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterBinding.java
index 266c8c7bae2..8ae06b7cebd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterBinding.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterBinding.java
@@ -2,11 +2,8 @@
 package com.yahoo.vespa.model.container.http;
 
 import com.yahoo.component.ComponentSpecification;
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.vespa.model.container.component.BindingPattern;
 
-import java.util.logging.Level;
-
 /**
  * @author bjorncs
  */
@@ -20,12 +17,7 @@ public class FilterBinding {
         this.binding = binding;
     }
 
-    public static FilterBinding create(ComponentSpecification filterId, BindingPattern binding, DeployLogger logger) {
-        if (binding.scheme().equals("https")) {
-            logger.log(Level.WARNING, String.format("For binding '%s' on '%s': 'https' bindings are deprecated, " +
-                                                    "use 'http' instead to bind to both http and https traffic.",
-                                                    binding, filterId));
-        }
+    public static FilterBinding create(ComponentSpecification filterId, BindingPattern binding) {
         return new FilterBinding(filterId, binding);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
index 658493a5bd2..d6007ae190f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
@@ -43,7 +43,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
         Element filteringElem = XML.getChild(spec, "filtering");
         if (filteringElem != null) {
             filterChains = new FilterChainsBuilder().build(deployState, ancestor, filteringElem);
-            bindings = readFilterBindings(filteringElem, deployState.getDeployLogger());
+            bindings = readFilterBindings(filteringElem);
 
             Element accessControlElem = XML.getChild(filteringElem, "access-control");
             if (accessControlElem != null) {
@@ -64,7 +64,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
 
     private AccessControl buildAccessControl(DeployState deployState, AbstractConfigProducer ancestor, Element accessControlElem) {
         AthenzDomain domain = getAccessControlDomain(deployState, accessControlElem);
-        AccessControl.Builder builder = new AccessControl.Builder(domain.value(), deployState.getDeployLogger());
+        AccessControl.Builder builder = new AccessControl.Builder(domain.value());
 
         getContainerCluster(ancestor).ifPresent(builder::setHandlers);
 
@@ -114,7 +114,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
         return Optional.of((ApplicationContainerCluster) currentProducer);
     }
 
-    private List<FilterBinding> readFilterBindings(Element filteringSpec, DeployLogger logger) {
+    private List<FilterBinding> readFilterBindings(Element filteringSpec) {
         List<FilterBinding> result = new ArrayList<>();
 
         for (Element child: XML.getChildren(filteringSpec)) {
@@ -124,7 +124,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
 
                 for (Element bindingSpec: XML.getChildren(child, "binding")) {
                     String binding = XML.getValue(bindingSpec);
-                    result.add(FilterBinding.create(chainId, BindingPattern.createUserGeneratedFromPattern(binding), logger));
+                    result.add(FilterBinding.create(chainId, BindingPattern.createUserGeneratedFromPattern(binding)));
                 }
             }
         }
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 857ff10e2bc..c6be67f74bb 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
@@ -370,7 +370,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         AthenzDomain tenantDomain = deployState.getProperties().athenzDomain().orElse(null);
         if (tenantDomain == null) return; // tenant domain not present, cannot add access control. this should eventually be a failure.
         AccessControl accessControl =
-                new AccessControl.Builder(tenantDomain.value(), deployState.getDeployLogger())
+                new AccessControl.Builder(tenantDomain.value())
                         .setHandlers(cluster)
                         .readEnabled(false)
                         .writeEnabled(false)