diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-04 22:42:13 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-04 22:42:13 +0100 |
commit | fd54b4e4b136b05b67b471dca3ca6ce3dd116710 (patch) | |
tree | 88ab77cc41620eb2b8639b10b7edd1e57b901f12 /vespa-athenz | |
parent | fae49834f53500587921196e86ee4af4c670d8c9 (diff) |
Revert collect(Collectors.toList())
Diffstat (limited to 'vespa-athenz')
5 files changed, 6 insertions, 6 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java index 2ff59b5746f..7d38dfda7fb 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java @@ -52,7 +52,7 @@ public class AthenzAccessToken { String domain = Optional.ofNullable(jwt().getClaim(AUDIENCE_CLAIM).asString()).orElse(""); return Optional.ofNullable(jwt().getClaim(SCOPE_CLAIM).asList(String.class)).orElse(List.of()).stream() .map(role -> new AthenzRole(domain, role)) - .toList(); + .collect(Collectors.toList()); } private DecodedJWT jwt() { diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java index b4431424952..dcc3452a69a 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java @@ -53,7 +53,7 @@ public class AthenzRoleInformation extends AthenzRole { var auditLog = roleEntity.auditLog() .stream() .map(entry -> new AuditLogEntry(entry.getAdmin(), entry.getAction(), entry.getAuditRef(), entry.getCreated())) - .toList(); + .collect(Collectors.toList()); return new AthenzRoleInformation(role.domain(), role.roleName(), isSelfServe, reviewEnabled, pendingRequest, auditLog); } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java index 7b3388d1027..aaf9038208f 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java @@ -346,7 +346,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { .filter(member -> ! member.pendingApproval()) .map(RoleEntity.Member::memberName) .map(AthenzIdentities::from) - .toList(); + .collect(Collectors.toList()); } @Override @@ -356,7 +356,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { return execute.services.stream() .map(serviceName -> new AthenzService(athenzDomain, serviceName)) - .toList(); + .collect(Collectors.toList()); } @Override diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java index b32e2bec7a9..7c48e8239d5 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java @@ -32,7 +32,7 @@ public class AccessTokenResponseEntity { this.roles = Stream.of(roles.split(" ")) .map(AthenzResourceName::fromString) .map(AthenzRole::fromResourceName) - .toList(); + .collect(Collectors.toList()); } public AthenzAccessToken accessToken() { diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java index 93574339c5a..52ce860bfce 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java @@ -253,7 +253,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen try { List<AthenzRole> roleList = roles.stream() .map(roleName -> new AthenzRole(domain, roleName)) - .toList(); + .collect(Collectors.toList()); return roleSpecificAccessTokenCache.get(roleList).value(); } catch (Exception e) { throw new AthenzIdentityProviderException("Could not retrieve access token: " + e.getMessage(), e); |