diff options
3 files changed, 6 insertions, 22 deletions
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 3aebe26b456..8cf430741f0 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 @@ -45,13 +45,9 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http> Element accessControlElem = XML.getChild(filteringElem, "access-control"); if (accessControlElem != null) { - if (deployState.isHosted()) { - accessControl = buildAccessControl(deployState, ancestor, accessControlElem); - bindings.addAll(accessControl.getBindings()); - filterChains.add(new Chain<>(FilterChains.emptyChainSpec(ACCESS_CONTROL_CHAIN_ID))); - } else { - deployState.getDeployLogger().log(LogLevel.WARNING, "The 'access-control' element is only supported in hosted Vespa."); - } + accessControl = buildAccessControl(deployState, ancestor, accessControlElem); + bindings.addAll(accessControl.getBindings()); + filterChains.add(new Chain<>(FilterChains.emptyChainSpec(ACCESS_CONTROL_CHAIN_ID))); } } else { filterChains = new FilterChainsBuilder().newChainsInstance(ancestor); 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 1ffb3743b4c..7cd26b2f1e6 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 @@ -7,8 +7,8 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest; 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.Binding; import com.yahoo.vespa.model.container.http.Http; +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; @@ -44,11 +44,6 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { StateHandler.STATE_API_ROOT, ContainerCluster.ROOT_HANDLER_PATH); - public AccessControlTest() { - // Note: isHosted is assigned in the constructor as it is used by a @Before annotated method in the super class. - isHosted = true; - } - @Test public void access_control_filter_chain_is_set_up() { Element clusterElem = DomBuilderTest.parse( diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java index 8eac7406059..9e02572737e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java @@ -5,8 +5,6 @@ import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.model.test.MockRoot; import com.yahoo.container.ComponentsConfig; import com.yahoo.vespa.model.VespaModel; @@ -52,7 +50,6 @@ public abstract class ContainerModelBuilderTestBase { " </nodes>"; protected MockRoot root; - protected boolean isHosted = false; public static void createModel(MockRoot root, DeployState deployState, VespaModel vespaModel, Element... containerElems) { for (Element containerElem : containerElems) { @@ -65,7 +62,7 @@ public abstract class ContainerModelBuilderTestBase { } public static void createModel(MockRoot root, Element... containerElems) { - createModel(root, root.getDeployState(), null, containerElems); + createModel(root, DeployState.createTestState(), null, containerElems); } public static void createModel(MockRoot root, DeployLogger testLogger, Element... containerElems) { @@ -80,11 +77,7 @@ public abstract class ContainerModelBuilderTestBase { @Before public void prepareTest() { - root = new MockRoot("root", - new DeployState.Builder() - .applicationPackage(new MockApplicationPackage.Builder().build()) - .properties(new TestProperties().setHostedVespa(isHosted)) - .build()); + root = new MockRoot("root"); } protected ComponentsConfig componentsConfig() { |