summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2022-07-15 14:55:05 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2022-07-15 15:35:10 +0200
commitef35cd168d1449c40dbdfaadc6ffb9ae19f996c4 (patch)
tree8d7db312f332b74d80faa0b5703b2e28d694c3ed
parent9bcb0afa58fbbdaeffaefe12cad46c7008713aaa (diff)
Rename 'hasAllCapabilities()' => 'hasAll()'
-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
2 files changed, 2 insertions, 2 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 195e200febb..65030fd640a 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.requiredCredentials = new ArrayList<>();
authorizedPeer.description = peerPolicy.description().orElse(null);
CapabilitySet caps = peerPolicy.capabilities();
- if (!caps.hasAllCapabilities()) {
+ if (!caps.hasAll()) {
authorizedPeer.capabilities = List.copyOf(caps.toCapabilityNames());
}
for (RequiredPeerCredential requiredPeerCredential : peerPolicy.requiredCredentials()) {
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 46a07972fc3..57ba155b3b7 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
@@ -70,7 +70,7 @@ public class CapabilitySet {
public static CapabilitySet all() { return ALL_CAPABILITIES; }
public static CapabilitySet none() { return NO_CAPABILITIES; }
- public boolean hasAllCapabilities() { return this.caps.equals(ALL_CAPABILITIES.caps); }
+ public boolean hasAll() { return this.caps.equals(ALL_CAPABILITIES.caps); }
public SortedSet<String> toCapabilityNames() {
return caps.stream().map(Capability::asString).collect(Collectors.toCollection(TreeSet::new));