From 93c37e6b154816cbfae6cd5c134e5916e62b5d02 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 12 Oct 2020 16:50:51 -0600 Subject: [PATCH] Update Test Controllers Closes gh-9121 --- .../security/config/http/MiscHttpConfigTests.java | 6 +++--- .../servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java index c4903195ab..9320052235 100644 --- a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java @@ -822,19 +822,19 @@ public class MiscHttpConfigTests { @RestController static class AuthenticationController { @GetMapping("/password") - public String password(@AuthenticationPrincipal Authentication authentication) { + public String password(Authentication authentication) { return (String) authentication.getCredentials(); } @GetMapping("/roles") - public String roles(@AuthenticationPrincipal Authentication authentication) { + public String roles(Authentication authentication) { return authentication.getAuthorities().stream() .map(GrantedAuthority::getAuthority) .collect(Collectors.joining(",")); } @GetMapping("/details") - public String details(@AuthenticationPrincipal Authentication authentication) { + public String details(Authentication authentication) { return authentication.getDetails().getClass().getName(); } } diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt index 1d11c6d1a3..04e193dc7d 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt @@ -176,7 +176,7 @@ class OpaqueTokenDslTests { @RestController class AuthenticationController { @GetMapping("/authenticated") - fun authenticated(@AuthenticationPrincipal authentication: Authentication): String { + fun authenticated(authentication: Authentication): String { return authentication.name } }