summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2022-07-15 15:23:13 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2022-07-15 15:35:10 +0200
commitebae2fd47ace3a9abca620e2bdabe225a7a04e01 (patch)
tree65d6a64531955d00405d1f6d4fdd1ffca160e006
parent1fba92f023c9a6f6e95cea1097b58514afffc92d (diff)
Rename 'toCapabilityNames()' to 'toNames()'
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java2
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/policy/CapabilitySet.java2
-rw-r--r--security-utils/src/test/java/com/yahoo/security/tls/policy/CapabilitySetTest.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
index 7fff6ca1efa..fcd84056212 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
@@ -154,7 +154,7 @@ public class TransportSecurityOptionsJsonSerializer {
authorizedPeer.description = peerPolicy.description().orElse(null);
CapabilitySet caps = peerPolicy.capabilities();
if (!caps.hasAll()) {
- authorizedPeer.capabilities = List.copyOf(caps.toCapabilityNames());
+ authorizedPeer.capabilities = List.copyOf(caps.toNames());
}
for (RequiredPeerCredential requiredPeerCredential : peerPolicy.requiredCredentials()) {
RequiredCredential requiredCredential = new RequiredCredential();
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/policy/CapabilitySet.java b/security-utils/src/main/java/com/yahoo/security/tls/policy/CapabilitySet.java
index 853e386dd67..50de98c621c 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/policy/CapabilitySet.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/policy/CapabilitySet.java
@@ -73,7 +73,7 @@ public class CapabilitySet {
public boolean hasAll() { return this.caps.equals(ALL_CAPABILITIES.caps); }
public boolean hasNone() { return this.caps.equals(NO_CAPABILITIES.caps); }
- public SortedSet<String> toCapabilityNames() {
+ public SortedSet<String> toNames() {
return caps.stream().map(Capability::asString).collect(Collectors.toCollection(TreeSet::new));
}
diff --git a/security-utils/src/test/java/com/yahoo/security/tls/policy/CapabilitySetTest.java b/security-utils/src/test/java/com/yahoo/security/tls/policy/CapabilitySetTest.java
index 3379c37e918..429e5b24513 100644
--- a/security-utils/src/test/java/com/yahoo/security/tls/policy/CapabilitySetTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/tls/policy/CapabilitySetTest.java
@@ -20,7 +20,7 @@ class CapabilitySetTest {
SortedSet<String> expectedNames = Arrays.stream(Capability.values())
.map(Capability::asString)
.collect(Collectors.toCollection(TreeSet::new));
- SortedSet<String> actualNames = CapabilitySet.all().toCapabilityNames();
+ SortedSet<String> actualNames = CapabilitySet.all().toNames();
assertEquals(expectedNames, actualNames);
}