diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-14 07:34:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 07:34:24 +0100 |
commit | 091367f1ecf37c23278bbde772128c60f8e08749 (patch) | |
tree | 8bf1f68cb4d654914a2092147f60e3d4d622f62b /jrt/src | |
parent | 98869035893b99654614d6ff76189e3dbbb52482 (diff) |
Revert "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 18affe35b6a..790aafd2743 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.of(capabilities)); } + public Method requireCapabilities(Capability... capabilities) { return requireCapabilities(CapabilitySet.from(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 3f5fabde973..90cc19880f0 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.of(requiredCapabilities)); + this(CapabilitySet.from(requiredCapabilities)); } public static RequireCapabilitiesFilter unclassified() { return UNCLASSIFIED; } |