Skip to content

method-security: fix invalid Kotlin syntax #16375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2025
Merged

method-security: fix invalid Kotlin syntax #16375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions docs/modules/ROOT/pages/servlet/authorization/method-security.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Kotlin::
open class MyCustomerService {
@PreAuthorize("hasAuthority('permission:read')")
@PostAuthorize("returnObject.owner == authentication.name")
fun readCustomer(val id: String): Customer { ... }
fun readCustomer(id: String): Customer { ... }
}
----
======
Expand Down Expand Up @@ -338,7 +338,7 @@ Kotlin::
@Component
open class BankService {
@PreAuthorize("hasRole('ADMIN')")
fun readAccount(val id: Long): Account {
fun readAccount(id: Long): Account {
// ... is only invoked if the `Authentication` has the `ROLE_ADMIN` authority
}
}
Expand Down Expand Up @@ -426,7 +426,7 @@ Kotlin::
@Component
open class BankService {
@PostAuthorize("returnObject.owner == authentication.name")
fun readAccount(val id: Long): Account {
fun readAccount(id: Long): Account {
// ... is only returned if the `Account` belongs to the logged in user
}
}
Expand Down Expand Up @@ -536,7 +536,7 @@ Kotlin::
@Component
open class BankService {
@RequireOwnership
fun readAccount(val id: Long): Account {
fun readAccount(id: Long): Account {
// ... is only returned if the `Account` belongs to the logged in user
}
}
Expand Down Expand Up @@ -993,7 +993,7 @@ Kotlin::
@Component
open class BankService {
@IsAdmin
fun readAccount(val id: Long): Account {
fun readAccount(id: Long): Account {
// ... is only returned if the `Account` belongs to the logged in user
}
}
Expand Down Expand Up @@ -1084,7 +1084,7 @@ Kotlin::
@Component
open class BankService {
@HasRole("ADMIN")
fun readAccount(val id: Long): Account {
fun readAccount(id: Long): Account {
// ... is only returned if the `Account` belongs to the logged in user
}
}
Expand Down Expand Up @@ -1144,7 +1144,7 @@ Kotlin::
@Component
open class BankService {
@HasAnyRole(roles = arrayOf("'USER'", "'ADMIN'"))
fun readAccount(val id: Long): Account {
fun readAccount(id: Long): Account {
// ... is only returned if the `Account` belongs to the logged in user
}
}
Expand Down Expand Up @@ -1271,7 +1271,7 @@ Kotlin::
----
@Component("authz")
open class AuthorizationLogic {
fun decide(val operations: MethodSecurityExpressionOperations): boolean {
fun decide(operations: MethodSecurityExpressionOperations): boolean {
// ... authorization logic
}
}
Expand Down Expand Up @@ -1342,7 +1342,7 @@ Kotlin::
----
@Component("authz")
open class AuthorizationLogic {
fun decide(val operations: MethodSecurityExpressionOperations): AuthorizationDecision {
fun decide(operations: MethodSecurityExpressionOperations): AuthorizationDecision {
// ... authorization logic
return MyAuthorizationDecision(false, details)
}
Expand Down Expand Up @@ -1435,13 +1435,13 @@ Kotlin::
class MethodSecurityConfig {
@Bean
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
fun preAuthorize(val manager: MyAuthorizationManager) : Advisor {
fun preAuthorize(manager: MyAuthorizationManager) : Advisor {
return AuthorizationManagerBeforeMethodInterceptor.preAuthorize(manager)
}

@Bean
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
fun postAuthorize(val manager: MyAuthorizationManager) : Advisor {
fun postAuthorize(manager: MyAuthorizationManager) : Advisor {
return AuthorizationManagerAfterMethodInterceptor.postAuthorize(manager)
}
}
Expand Down Expand Up @@ -1501,7 +1501,7 @@ Kotlin::
----
companion object {
@Bean
fun methodSecurityExpressionHandler(val roleHierarchy: RoleHierarchy) : MethodSecurityExpressionHandler {
fun methodSecurityExpressionHandler(roleHierarchy: RoleHierarchy) : MethodSecurityExpressionHandler {
val handler = DefaultMethodSecurityExpressionHandler()
handler.setRoleHierarchy(roleHierarchy)
return handler
Expand Down Expand Up @@ -3236,7 +3236,7 @@ Kotlin::
[source,kotlin,role="secondary"]
----
class MyAuthorizer {
fun isAdmin(val root: MethodSecurityExpressionOperations): boolean {
fun isAdmin(root: MethodSecurityExpressionOperations): boolean {
val decision = root.hasAuthority("ADMIN");
// custom work ...
return decision;
Expand Down Expand Up @@ -3295,7 +3295,7 @@ Kotlin::
----
@Component
class MyExpressionHandler: DefaultMethodSecurityExpressionHandler {
override fun createEvaluationContext(val authentication: Supplier<Authentication>,
override fun createEvaluationContext(authentication: Supplier<Authentication>,
val mi: MethodInvocation): EvaluationContext {
val context = super.createEvaluationContext(authentication, mi) as StandardEvaluationContext
val delegate = context.getRootObject().getValue() as MethodSecurityExpressionOperations
Expand Down
Loading