diff options
9 files changed, 16 insertions, 16 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 1dd866ae571..abb30ba2544 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.from(Capability.HTTP_UNCLASSIFIED); + CapabilitySet DEFAULT_REQUIRED_CAPABILITIES = CapabilitySet.of(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 59b78a1423d..1fd30edb252 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.from(capabilities)); + return requiredCapabilities(CapabilitySet.of(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.from(capabilities)); + return requiredCapabilities(CapabilitySet.of(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.from(capabilities)); + return withRequiredCapabilities(CapabilitySet.of(capabilities)); } @Override public HandlerConfigBuilder withRequiredCapabilities(CapabilitySet capabilities) { if (requiredCapabilities != null) throw new IllegalStateException("Capabilities already set"); 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; } diff --git a/security-utils/src/main/java/com/yahoo/security/tls/Capability.java b/security-utils/src/main/java/com/yahoo/security/tls/Capability.java index a11b6d5f96a..d30ef3fdf24 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/Capability.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/Capability.java @@ -38,7 +38,7 @@ public enum Capability implements ToCapabilitySet { public String asString() { return name; } - @Override public CapabilitySet toCapabilitySet() { return CapabilitySet.from(this); } + @Override public CapabilitySet toCapabilitySet() { return CapabilitySet.of(this); } public static Capability fromName(String name) { return Arrays.stream(values()) diff --git a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java index 70217665241..fa67ab4fe23 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java @@ -38,7 +38,7 @@ public class CapabilitySet implements ToCapabilitySet { "vespa.config_server"); private static CapabilitySet predefined(String name, ToCapabilitySet... capabilities) { - var instance = CapabilitySet.from(capabilities); + var instance = CapabilitySet.of(capabilities); PREDEFINED.put(name, instance); return instance; } @@ -68,13 +68,13 @@ public class CapabilitySet implements ToCapabilitySet { return new CapabilitySet(union); } - public static CapabilitySet from(ToCapabilitySet... capabilities) { + public static CapabilitySet of(ToCapabilitySet... capabilities) { return CapabilitySet.unionOf(Arrays.stream(capabilities).map(ToCapabilitySet::toCapabilitySet).toList()); } - public static CapabilitySet from(EnumSet<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } - public static CapabilitySet from(Collection<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } - public static CapabilitySet from(Capability... caps) { return new CapabilitySet(EnumSet.copyOf(List.of(caps))); } + public static CapabilitySet of(EnumSet<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } + public static CapabilitySet of(Collection<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } + public static CapabilitySet of(Capability... caps) { return new CapabilitySet(EnumSet.copyOf(List.of(caps))); } public static CapabilitySet all() { return ALL_CAPABILITIES; } public static CapabilitySet none() { return NO_CAPABILITIES; } diff --git a/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java b/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java index ae36cc2f774..11fd933a562 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java @@ -28,13 +28,13 @@ class ConnectionAuthContextTest { void fails_on_missing_capabilities() { ConnectionAuthContext ctx = createConnectionAuthContext(); assertThrows(MissingCapabilitiesException.class, - () -> ctx.verifyCapabilities(CapabilitySet.from(Capability.CONTENT__STATUS_PAGES))); + () -> ctx.verifyCapabilities(CapabilitySet.of(Capability.CONTENT__STATUS_PAGES))); } @Test void creates_correct_error_message() { ConnectionAuthContext ctx = createConnectionAuthContext(); - CapabilitySet requiredCaps = CapabilitySet.from(Capability.CONTENT__STATUS_PAGES); + CapabilitySet requiredCaps = CapabilitySet.of(Capability.CONTENT__STATUS_PAGES); String expectedMessage = """ Permission denied for 'myaction' on 'myresource'. Peer 'mypeer' with [CN='myidentity']. Requires capabilities [vespa.content.status_pages] but peer has diff --git a/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java b/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java index bea5c6108f2..55fa8424ae3 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/PeerAuthorizerTest.java @@ -149,7 +149,7 @@ public class PeerAuthorizerTest { } private static PeerPolicy createPolicy(String name, List<Capability> caps, List<RequiredPeerCredential> creds) { - return new PeerPolicy(name, Optional.empty(), CapabilitySet.from(caps), creds); + return new PeerPolicy(name, Optional.empty(), CapabilitySet.of(caps), creds); } private static void assertAuthorized(ConnectionAuthContext result) { diff --git a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java index 895428037ed..9ba5886e408 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java @@ -49,7 +49,7 @@ public class TransportSecurityOptionsJsonSerializerTest { RequiredPeerCredential.of(SAN_DNS, "*.suffix.com"), RequiredPeerCredential.of(SAN_URI, "myscheme://resource/path/"))), new PeerPolicy("node", Optional.empty(), - CapabilitySet.from(Capability.SLOBROK__API), + CapabilitySet.of(Capability.SLOBROK__API), Collections.singletonList(RequiredPeerCredential.of(CN, "hostname"))))))) .build(); |