Merge pull request #26021 from vespa-engine/revert-26012-bjorncs/capabilities

Revert "Bjorncs/capabilities"

2 files changed, 4 insertions, 4 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/utils/CapabilityRequiringRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/utils/CapabilityRequiringRequestHandler.java
index abb30ba2544..1dd866ae571 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/utils/CapabilityRequiringRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/utils/CapabilityRequiringRequestHandler.java
@@ -12,7 +12,7 @@ import com.yahoo.security.tls.CapabilitySet;
  */
 public interface CapabilityRequiringRequestHandler extends RequestHandler {
 
-    CapabilitySet DEFAULT_REQUIRED_CAPABILITIES = CapabilitySet.of(Capability.HTTP_UNCLASSIFIED);
+    CapabilitySet DEFAULT_REQUIRED_CAPABILITIES = CapabilitySet.from(Capability.HTTP_UNCLASSIFIED);
 
     default CapabilitySet requiredCapabilities(RequestView req) { return DEFAULT_REQUIRED_CAPABILITIES; }
 
diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
index 1fd30edb252..59b78a1423d 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
@@ -269,7 +269,7 @@ class RestApiImpl implements RestApi {
         @Override public Builder disableDefaultAclMapping() { this.disableDefaultAclMapping = true; return this; }
 
         @Override public Builder requiredCapabilities(Capability... capabilities) {
-            return requiredCapabilities(CapabilitySet.of(capabilities));
+            return requiredCapabilities(CapabilitySet.from(capabilities));
         }
         @Override public Builder requiredCapabilities(CapabilitySet capabilities) {
             if (requiredCapabilities != null) throw new IllegalStateException("Capabilities already set");
@@ -293,7 +293,7 @@ class RestApiImpl implements RestApi {
         @Override public RestApi.RouteBuilder name(String name) { this.name = name; return this; }
 
         @Override public RestApi.RouteBuilder requiredCapabilities(Capability... capabilities) {
-            return requiredCapabilities(CapabilitySet.of(capabilities));
+            return requiredCapabilities(CapabilitySet.from(capabilities));
         }
         @Override public RestApi.RouteBuilder requiredCapabilities(CapabilitySet capabilities) {
             if (requiredCapabilities != null) throw new IllegalStateException("Capabilities already set");
@@ -396,7 +396,7 @@ class RestApiImpl implements RestApi {
         private CapabilitySet requiredCapabilities;
 
         @Override public HandlerConfigBuilder withRequiredCapabilities(Capability... capabilities) {
-            return withRequiredCapabilities(CapabilitySet.of(capabilities));
+            return withRequiredCapabilities(CapabilitySet.from(capabilities));
         }
         @Override public HandlerConfigBuilder withRequiredCapabilities(CapabilitySet capabilities) {
             if (requiredCapabilities != null) throw new IllegalStateException("Capabilities already set");