Rename 'Binding' -> 'FilterBinding'

6 files changed, 24 insertions, 24 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 9676b8b1e4a..a7335eeeeac 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
@@ -104,7 +104,7 @@ public final class AccessControl {
         this.logger = logger;
     }
 
-    public List<Binding> getBindings() {
+    public List<FilterBinding> getBindings() {
         return Stream.concat(getHandlerBindings(), getServletBindings())
                 .collect(Collectors.toCollection(ArrayList::new));
     }
@@ -113,14 +113,14 @@ public final class AccessControl {
         return cluster.getHandlers().stream().anyMatch(AccessControl::handlerNeedsProtection);
     }
 
-    private Stream<Binding> getHandlerBindings() {
+    private Stream<FilterBinding> getHandlerBindings() {
         return handlers.stream()
                         .filter(this::shouldHandlerBeProtected)
                         .flatMap(handler -> handler.getServerBindings().stream())
                         .map(binding -> accessControlBinding(binding, logger));
     }
 
-    private Stream<Binding> getServletBindings() {
+    private Stream<FilterBinding> getServletBindings() {
         return servlets.stream()
                 .filter(this::shouldServletBeProtected)
                 .flatMap(AccessControl::servletBindings)
@@ -140,8 +140,8 @@ public final class AccessControl {
         return servletBindings(servlet).noneMatch(excludedBindings::contains);
     }
 
-    private static Binding accessControlBinding(String binding, DeployLogger logger) {
-        return Binding.create(new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), binding, logger);
+    private static FilterBinding accessControlBinding(String binding, DeployLogger logger) {
+        return FilterBinding.create(new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), binding, logger);
     }
 
     private static Stream<String> servletBindings(Servlet servlet) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Binding.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterBinding.java
index 28f4949f210..8bb4de9e3f2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Binding.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterBinding.java
@@ -9,23 +9,23 @@ import java.util.logging.Level;
 /**
  * @author bjorncs
  */
-public class Binding {
+public class FilterBinding {
 
     private final ComponentSpecification filterId;
     private final String binding;
 
-    private Binding(ComponentSpecification filterId, String binding) {
+    private FilterBinding(ComponentSpecification filterId, String binding) {
         this.filterId = filterId;
         this.binding = binding;
     }
 
-    public static Binding create(ComponentSpecification filterId, String binding, DeployLogger logger) {
+    public static FilterBinding create(ComponentSpecification filterId, String binding, DeployLogger logger) {
         if (binding.startsWith("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));
         }
-        return new Binding(filterId, binding);
+        return new FilterBinding(filterId, binding);
     }
 
     public ComponentSpecification filterId() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java
index 0fcf7b2d06c..1d54ddb3e39 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java
@@ -21,7 +21,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> implements ServerConfig.Producer {
 
     private final FilterChains filterChains;
-    private final List<Binding> bindings = new CopyOnWriteArrayList<>();
+    private final List<FilterBinding> bindings = new CopyOnWriteArrayList<>();
     private volatile JettyHttpServer httpServer;
     private volatile AccessControl accessControl;
 
@@ -64,7 +64,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl
         setHttpServer(null);
     }
 
-    public List<Binding> getBindings() {
+    public List<FilterBinding> getBindings() {
         return bindings;
     }
 
@@ -74,7 +74,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl
 
     @Override
     public void getConfig(ServerConfig.Builder builder) {
-        for (Binding binding : bindings) {
+        for (FilterBinding binding : bindings) {
             builder.filter(new ServerConfig.Filter.Builder()
                     .id(binding.filterId().stringValue())
                     .binding(binding.binding()));
@@ -83,7 +83,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl
 
     @Override
     public void validate() {
-        if (((Collection<Binding>) bindings).isEmpty()) return;
+        if (((Collection<FilterBinding>) bindings).isEmpty()) return;
 
         if (filterChains == null)
             throw new IllegalArgumentException("Null FilterChains are not allowed when there are filter bindings");
@@ -91,7 +91,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl
         ComponentRegistry<ChainedComponent<?>> filters = filterChains.componentsRegistry();
         ComponentRegistry<Chain<Filter>> chains = filterChains.allChains();
 
-        for (Binding binding: bindings) {
+        for (FilterBinding binding: bindings) {
             if (filters.getComponent(binding.filterId()) == null && chains.getComponent(binding.filterId()) == null)
                 throw new RuntimeException("Can't find filter " + binding.filterId() + " for binding " + binding.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 bfde9b9add1..c4ab267aadb 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
@@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.component.chain.Chain;
 import com.yahoo.vespa.model.container.http.AccessControl;
-import com.yahoo.vespa.model.container.http.Binding;
+import com.yahoo.vespa.model.container.http.FilterBinding;
 import com.yahoo.vespa.model.container.http.FilterChains;
 import com.yahoo.vespa.model.container.http.Http;
 import org.w3c.dom.Element;
@@ -36,7 +36,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
     @Override
     protected Http doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element spec) {
         FilterChains filterChains;
-        List<Binding> bindings = new ArrayList<>();
+        List<FilterBinding> bindings = new ArrayList<>();
         AccessControl accessControl = null;
 
         Element filteringElem = XML.getChild(spec, "filtering");
@@ -113,8 +113,8 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
         return Optional.of((ApplicationContainerCluster) currentProducer);
     }
 
-    private List<Binding> readFilterBindings(Element filteringSpec, DeployLogger logger) {
-        List<Binding> result = new ArrayList<>();
+    private List<FilterBinding> readFilterBindings(Element filteringSpec, DeployLogger logger) {
+        List<FilterBinding> result = new ArrayList<>();
 
         for (Element child: XML.getChildren(filteringSpec)) {
             String tagName = child.getTagName();
@@ -123,7 +123,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
 
                 for (Element bindingSpec: XML.getChildren(child, "binding")) {
                     String binding = XML.getValue(bindingSpec);
-                    result.add(Binding.create(chainId, binding, logger));
+                    result.add(FilterBinding.create(chainId, binding, logger));
                 }
             }
         }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
index 0f9de516a4b..4e82b85bd3f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
@@ -48,7 +48,7 @@ public class FilterBindingsTest extends DomBuilderTest {
                 "</http>");
         Http http = buildHttp(xml);
 
-        Binding binding = first(http.getBindings());
+        FilterBinding binding = first(http.getBindings());
         assertEquals("my-request-chain", binding.filterId().getName());
         assertEquals(MY_CHAIN_BINDING, binding.binding());
 
@@ -68,7 +68,7 @@ public class FilterBindingsTest extends DomBuilderTest {
                 "</http>");
         Http http = buildHttp(xml);
 
-        Binding binding = first(http.getBindings());
+        FilterBinding binding = first(http.getBindings());
         assertEquals("my-response-chain", binding.filterId().getName());
         assertEquals(MY_CHAIN_BINDING, binding.binding());
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index 28e23ce3222..faa868a23a4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.http.AccessControl;
 import com.yahoo.vespa.model.container.http.Http;
-import com.yahoo.vespa.model.container.http.Binding;
+import com.yahoo.vespa.model.container.http.FilterBinding;
 import com.yahoo.vespa.model.container.http.xml.HttpBuilder;
 import com.yahoo.vespa.model.container.jersey.Jersey2Servlet;
 import org.junit.Test;
@@ -312,8 +312,8 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         return http;
     }
 
-    private boolean containsBinding(Collection<Binding> bindings, String binding) {
-        for (Binding b : bindings) {
+    private boolean containsBinding(Collection<FilterBinding> bindings, String binding) {
+        for (FilterBinding b : bindings) {
             if (b.binding().contains(binding))
                 return true;
         }