Move Binding class out of Http

2 files changed, 10 insertions, 10 deletions

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 4d04a1be614..b6d63af180d 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
@@ -52,9 +52,9 @@ public class FilterBindingsTest extends DomBuilderTest {
                 "</http>");
         Http http = buildHttp(xml);
 
-        Http.Binding binding = first(http.bindings);
-        assertThat(binding.filterId.getName(), is("my-request-chain"));
-        assertThat(binding.binding, is(MY_CHAIN_BINDING));
+        Binding binding = first(http.bindings);
+        assertThat(binding.filterId().getName(), is("my-request-chain"));
+        assertThat(binding.binding(), is(MY_CHAIN_BINDING));
 
         Chain<Filter> myChain = http.getFilterChains().allChains().getComponent("my-request-chain");
         assertNotNull("Missing chain", myChain);
@@ -72,9 +72,9 @@ public class FilterBindingsTest extends DomBuilderTest {
                 "</http>");
         Http http = buildHttp(xml);
 
-        Http.Binding binding = first(http.bindings);
-        assertThat(binding.filterId.getName(), is("my-response-chain"));
-        assertThat(binding.binding, is(MY_CHAIN_BINDING));
+        Binding binding = first(http.bindings);
+        assertThat(binding.filterId().getName(), is("my-response-chain"));
+        assertThat(binding.binding(), is(MY_CHAIN_BINDING));
 
         Chain<Filter> myChain = http.getFilterChains().allChains().getComponent("my-response-chain");
         assertNotNull("Missing chain", myChain);
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 f5df3df0070..5433c7659cc 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
@@ -8,7 +8,7 @@ import com.yahoo.container.jdisc.state.StateHandler;
 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.Http.Binding;
+import com.yahoo.vespa.model.container.http.Binding;
 import com.yahoo.vespa.model.container.http.xml.HttpBuilder;
 import com.yahoo.vespa.model.container.jersey.Jersey2Servlet;
 import org.junit.Test;
@@ -140,8 +140,8 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
                    missingRequiredBindings.isEmpty());
 
         FORBIDDEN_HANDLER_BINDINGS.forEach(forbiddenBinding -> http.getBindings().forEach(
-                binding -> assertFalse("Access control chain was bound to: " + binding.binding,
-                                       binding.binding.contains(forbiddenBinding))));
+                binding -> assertFalse("Access control chain was bound to: " + binding.binding(),
+                                       binding.binding().contains(forbiddenBinding))));
     }
 
     @Test
@@ -256,7 +256,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
 
     private boolean containsBinding(Collection<Binding> bindings, String binding) {
         for (Binding b : bindings) {
-            if (b.binding.contains(binding))
+            if (b.binding().contains(binding))
                 return true;
         }
         return false;