aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-11-18 13:47:18 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-11-18 13:47:18 +0100
commitb95f3f505f38c4d90d3b776e21fd267b1e6cc613 (patch)
tree1970254d61b874925811a3936d79ebd716e0d64a /config-model/src/main/java/com/yahoo/vespa
parent86dcfcae106df6618fac167dafef69d4e73abbf2 (diff)
Rename setters in ConnectorFactory.Builder
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java9
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java6
3 files changed, 8 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
index 2106da2b22b..67b3ec0f6a7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
@@ -77,17 +77,16 @@ public class ConnectorFactory extends SimpleComponent implements ConnectorConfig
this.listenPort = listenPort;
}
- public Builder setSslProvider(SslProvider sslProvider) {
+ public Builder sslProvider(SslProvider sslProvider) {
this.sslProvider = sslProvider; return this;
}
- public Builder setDefaultRequestFilterChain(ComponentId filterChain) {
+ public Builder defaultRequestFilterChain(ComponentId filterChain) {
this.defaultRequestFilterChain = filterChain; return this;
}
- public Builder setDefaultResponseFilterChain(ComponentId filterChain) {
- this.defaultResponseFilterChain = filterChain;
- return this;
+ public Builder defaultResponseFilterChain(ComponentId filterChain) {
+ this.defaultResponseFilterChain = filterChain; return this;
}
public ConnectorFactory build() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
index 64e705b8b3e..3bbfd5b9165 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
@@ -47,7 +47,7 @@ public class HostedSslConnectorFactory extends ConnectorFactory {
}
private HostedSslConnectorFactory(SslProvider sslProvider, boolean enforceClientAuth, boolean enforceHandshakeClientAuth) {
- super(new Builder("tls4443", 4443).setSslProvider(sslProvider));
+ super(new Builder("tls4443", 4443).sslProvider(sslProvider));
this.enforceClientAuth = enforceClientAuth;
this.enforceHandshakeClientAuth = enforceHandshakeClientAuth;
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
index 9f25550418e..c3f6264a8cc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
@@ -34,12 +34,12 @@ public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuil
ConnectorFactory.Builder builder = new ConnectorFactory.Builder(name, port);
XmlHelper.getOptionalAttribute(serverSpec, "default-request-chain")
.map(ComponentId::new)
- .ifPresent(builder::setDefaultRequestFilterChain);
+ .ifPresent(builder::defaultRequestFilterChain);
XmlHelper.getOptionalAttribute(serverSpec, "default-response-chain")
.map(ComponentId::new)
- .ifPresent(builder::setDefaultResponseFilterChain);
+ .ifPresent(builder::defaultResponseFilterChain);
SslProvider sslProviderComponent = getSslConfigComponents(name, serverSpec);
- return builder.setSslProvider(sslProviderComponent).build();
+ return builder.sslProvider(sslProviderComponent).build();
}
SslProvider getSslConfigComponents(String serverName, Element serverSpec) {