diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-14 06:38:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 06:38:05 +0100 |
commit | 98869035893b99654614d6ff76189e3dbbb52482 (patch) | |
tree | de5929dfea715eea5b240f4e22cdf70c1a4c3d3c /jrt/src | |
parent | 0fa853df47b6cb208303bcf0ee0ff34e801a7c45 (diff) | |
parent | 4887b76984bb002dcfc97db45431411ef5ba6fa0 (diff) |
Merge pull request #26012 from vespa-engine/bjorncs/capabilities
Bjorncs/capabilities
Diffstat (limited to 'jrt/src')
-rw-r--r-- | jrt/src/com/yahoo/jrt/Method.java | 2 | ||||
-rw-r--r-- | jrt/src/com/yahoo/jrt/RequireCapabilitiesFilter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jrt/src/com/yahoo/jrt/Method.java b/jrt/src/com/yahoo/jrt/Method.java index 790aafd2743..18affe35b6a 100644 --- a/jrt/src/com/yahoo/jrt/Method.java +++ b/jrt/src/com/yahoo/jrt/Method.java @@ -154,7 +154,7 @@ public class Method { } public Method requestAccessFilter(RequestAccessFilter filter) { verifyNoFilterAssigned(); this.filter = filter; return this; } - public Method requireCapabilities(Capability... capabilities) { return requireCapabilities(CapabilitySet.from(capabilities)); } + public Method requireCapabilities(Capability... capabilities) { return requireCapabilities(CapabilitySet.of(capabilities)); } public Method requireCapabilities(CapabilitySet capabilities) { verifyNoFilterAssigned(); filter = new RequireCapabilitiesFilter(capabilities); diff --git a/jrt/src/com/yahoo/jrt/RequireCapabilitiesFilter.java b/jrt/src/com/yahoo/jrt/RequireCapabilitiesFilter.java index 90cc19880f0..3f5fabde973 100644 --- a/jrt/src/com/yahoo/jrt/RequireCapabilitiesFilter.java +++ b/jrt/src/com/yahoo/jrt/RequireCapabilitiesFilter.java @@ -20,7 +20,7 @@ public class RequireCapabilitiesFilter implements RequestAccessFilter { } public RequireCapabilitiesFilter(Capability... requiredCapabilities) { - this(CapabilitySet.from(requiredCapabilities)); + this(CapabilitySet.of(requiredCapabilities)); } public static RequireCapabilitiesFilter unclassified() { return UNCLASSIFIED; } |