Revert "Revert "Bjorncs/capabilities""

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; }