diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-10 15:57:28 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-13 14:07:30 +0100 |
commit | 495c0799f0761c2b664eca5ca1f750b1fa4c3b9c (patch) | |
tree | 7f571b5393351fd36a96303f3b429c15bcbf4c21 /security-utils/src | |
parent | 3da5e19509fcc10d4cdbcc49747cacc7cac2ae2e (diff) |
Rename 'from()' to 'of()'
Diffstat (limited to 'security-utils/src')
5 files changed, 10 insertions, 10 deletions
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(); |