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/main/java/com/yahoo/security/tls | |
parent | 3da5e19509fcc10d4cdbcc49747cacc7cac2ae2e (diff) |
Rename 'from()' to 'of()'
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/Capability.java | 2 | ||||
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java | 10 |
2 files changed, 6 insertions, 6 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; } |