Import Binding class.

2 files changed, 7 insertions, 5 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 49ffb9d4a23..9dafbbf66b4 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
@@ -7,6 +7,7 @@ import com.yahoo.component.ComponentSpecification;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.FileStatusHandlerComponent;
 import com.yahoo.vespa.model.container.component.Handler;
+import com.yahoo.vespa.model.container.http.Http.Binding;
 
 import java.util.ArrayList;
 
@@ -31,8 +32,8 @@ public final class AccessControl {
         return ! unprotectedHandlers.contains(handler.getClassId().getName());
     }
 
-    public static Http.Binding accessControlBinding(String binding) {
-        return new Http.Binding(new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), binding);
+    public static Binding accessControlBinding(String binding) {
+        return new Binding(new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), 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 e406a6696fd..73dadc14c1c 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,6 +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 org.junit.Test;
 import org.w3c.dom.Element;
 
@@ -98,14 +99,14 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
                    missingRequiredBindings.isEmpty());
 
         for (String forbiddenBinding : forbiddenBindings) {
-            for (Http.Binding binding : http.getBindings())
+            for (Binding binding : http.getBindings())
                 assertFalse("Access control chain was bound to: ",
                             binding.binding.contains(forbiddenBinding));
         }
     }
 
-    private boolean containsBinding(Collection<Http.Binding> bindings, String binding) {
-        for (Http.Binding b : bindings) {
+    private boolean containsBinding(Collection<Binding> bindings, String binding) {
+        for (Binding b : bindings) {
             if (b.binding.contains(binding))
                 return true;
         }