diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-08-18 13:48:06 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-08-18 13:48:06 +0200 |
| commit | e8f176b37a012028242b6983f0ac92994b5ec8b8 (patch) | |
| tree | f89d0474386c651c04b7f8b4eed4f00f9803b5a4 | |
| parent | 8373e8d51ff3019e94f82211df16efae23080fe6 (diff) | |
Rename 'fromPortAndPath' -> 'fromHttpPortAndPath'
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/component/SystemBindingPattern.java | 2 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/SystemBindingPattern.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/SystemBindingPattern.java index 922881f6668..3ae531539ef 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/SystemBindingPattern.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/SystemBindingPattern.java @@ -13,7 +13,7 @@ public class SystemBindingPattern extends BindingPattern { public static SystemBindingPattern fromHttpPath(String path) { return new SystemBindingPattern("http", "*", null, path);} public static SystemBindingPattern fromPattern(String binding) { return new SystemBindingPattern(binding);} - public static SystemBindingPattern fromPortAndPath(String port, String path) { return new SystemBindingPattern("http", "*", port, path); } + public static SystemBindingPattern fromHttpPortAndPath(String port, String path) { return new SystemBindingPattern("http", "*", port, path); } @Override public String toString() { 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 d3688172a7f..6f628891c42 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 @@ -146,11 +146,11 @@ public class AccessControl { private static FilterBinding createAccessControlBinding(String path) { return FilterBinding.create( new ComponentSpecification(ACCESS_CONTROL_CHAIN_ID.stringValue()), - SystemBindingPattern.fromPortAndPath(Integer.toString(HOSTED_CONTAINER_PORT), path)); + SystemBindingPattern.fromHttpPortAndPath(Integer.toString(HOSTED_CONTAINER_PORT), path)); } private static FilterBinding createAccessControlExcludedBinding(BindingPattern excludedBinding) { - BindingPattern rewrittenBinding = SystemBindingPattern.fromPortAndPath( + BindingPattern rewrittenBinding = SystemBindingPattern.fromHttpPortAndPath( Integer.toString(HOSTED_CONTAINER_PORT), excludedBinding.path()); // only keep path from excluded binding return FilterBinding.create( new ComponentSpecification(ACCESS_CONTROL_EXCLUDED_CHAIN_ID.stringValue()), |