1 files changed, 0 insertions, 80 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java
deleted file mode 100644
index 249827b11d9..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.application.validation;
-
-import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.container.ApplicationContainerCluster;
-import com.yahoo.vespa.model.container.component.BindingPattern;
-import com.yahoo.vespa.model.container.component.Handler;
-import com.yahoo.vespa.model.container.component.SystemBindingPattern;
-import com.yahoo.vespa.model.container.http.FilterBinding;
-import com.yahoo.vespa.model.container.http.Http;
-
-import java.util.logging.Level;
-
-import static com.yahoo.config.model.ConfigModelContext.ApplicationType.HOSTED_INFRASTRUCTURE;
-
-/**
- * Validates URI bindings for filters and handlers
- *
- * @author bjorncs
- */
-class UriBindingsValidator extends Validator {
-
-    @Override
-    public void validate(VespaModel model, DeployState deployState) {
-        for (ApplicationContainerCluster cluster : model.getContainerClusters().values()) {
-            for (Handler<?> handler : cluster.getHandlers()) {
-                for (BindingPattern binding : handler.getServerBindings()) {
-                    validateUserBinding(binding, model, deployState);
-                }
-            }
-            Http http = cluster.getHttp();
-            if (http != null) {
-                for (FilterBinding binding : cluster.getHttp().getBindings()) {
-                    validateUserBinding(binding.binding(), model, deployState);
-                }
-            }
-        }
-    }
-
-    private static void validateUserBinding(BindingPattern binding, VespaModel model, DeployState deployState) {
-        validateScheme(binding, deployState);
-        if (isHostedApplication(model, deployState)) {
-            validateHostedApplicationUserBinding(binding);
-        }
-    }
-
-    private static void validateScheme(BindingPattern binding, DeployState deployState) {
-        if (binding.scheme().equals("https")) {
-            String message = createErrorMessage(
-                    binding, "'https' bindings are deprecated, use 'http' instead to bind to both http and https traffic.");
-            deployState.getDeployLogger().log(Level.WARNING, message);
-        }
-    }
-
-    private static void validateHostedApplicationUserBinding(BindingPattern binding) {
-        // only perform these validation for used-generated bindings
-        // bindings produced by the hosted config model amender will violate some of the rules below
-        if (binding instanceof SystemBindingPattern) return;
-
-        if (binding.port().isPresent()) {
-            throw new IllegalArgumentException(createErrorMessage(binding, "binding with port is not allowed"));
-        }
-        if (!binding.host().equals(BindingPattern.WILDCARD_PATTERN)) {
-            throw new IllegalArgumentException(createErrorMessage(binding, "only binding with wildcard ('*') for hostname is allowed"));
-        }
-        if (!binding.scheme().equals("http") && !binding.scheme().equals("https")) {
-            throw new IllegalArgumentException(createErrorMessage(binding, "only 'http' is allowed as scheme"));
-        }
-    }
-
-    private static boolean isHostedApplication(VespaModel model, DeployState deployState) {
-        return deployState.isHosted() && model.getAdmin().getApplicationType() != HOSTED_INFRASTRUCTURE;
-    }
-
-    private static String createErrorMessage(BindingPattern binding, String message) {
-        return String.format("For binding '%s': %s", binding.patternString(), message);
-    }
-
-}