summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-08-18 14:13:07 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-08-18 14:13:07 +0200
commitc13793f64a364babc5032b5229223b562cd54fed (patch)
tree8ef8965c79062e81fcfd6541dbb989fc298981ac
parent39023ba2fd955c51a430aa5886c7fe5344050a9e (diff)
Rename 'configure' -> 'configureHttpFilterChains'
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java3
3 files changed, 3 insertions, 4 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 c2a13a44473..e96951dc83a 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
@@ -96,7 +96,7 @@ public class AccessControl {
this.handlers = handlers;
}
- public void configure(Http http) {
+ public void configureHttpFilterChains(Http http) {
http.setAccessControl(this);
addAccessControlFilterChain(http);
addAccessControlExcludedChain(http);
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 429cc45325b..c86d8b206d5 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
@@ -54,7 +54,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
http.getBindings().addAll(bindings);
http.setHttpServer(new JettyHttpServerBuilder().build(deployState, ancestor, spec));
if (accessControl != null) {
- accessControl.configure(http);
+ accessControl.configureHttpFilterChains(http);
}
return http;
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 1234a4ebc48..51583588201 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -61,7 +61,6 @@ import com.yahoo.vespa.model.container.component.FileStatusHandlerComponent;
import com.yahoo.vespa.model.container.component.Handler;
import com.yahoo.vespa.model.container.component.SystemBindingPattern;
import com.yahoo.vespa.model.container.component.UserBindingPattern;
-import com.yahoo.vespa.model.container.component.chain.Chain;
import com.yahoo.vespa.model.container.component.chain.ProcessingHandler;
import com.yahoo.vespa.model.container.docproc.ContainerDocproc;
import com.yahoo.vespa.model.container.docproc.DocprocChains;
@@ -375,7 +374,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
.readEnabled(false)
.writeEnabled(false)
.build()
- .configure(http);
+ .configureHttpFilterChains(http);
}
private Http buildHttp(DeployState deployState, ApplicationContainerCluster cluster, Element httpElement) {