root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Use Any? in ProceedingJoinPoint Kotlin examples 

This commit changes Any to Any? in ProceedingJoinPoint
Kotlin examples in order to be consistent with Java
and avoid a "NullPointerException: pjp.proceed() must
not be null" error.

See gh-31015
This commit is contained in:
AlmostFamiliar 2023-08-08 14:39:34 +02:00 committed by Sébastien Deleuze
parent d254bff197
commit 1c6ef3fe38
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc
View File

@ -176,7 +176,7 @@ Kotlin::
@AfterReturning( @AfterReturning(
pointcut = "execution(* com.xyz.dao.*.*(..))", pointcut = "execution(* com.xyz.dao.*.*(..))",
returning = "retVal") returning = "retVal")
fun doAccessCheck(retVal: Any) { fun doAccessCheck(retVal: Any?) {
// ... // ...
} }
} }
@ -448,7 +448,7 @@ Kotlin::
class AroundExample { class AroundExample {
@Around("execution(* com.xyz..service.*.*(..))") @Around("execution(* com.xyz..service.*.*(..))")
fun doBasicProfiling(pjp: ProceedingJoinPoint): Any { fun doBasicProfiling(pjp: ProceedingJoinPoint): Any? {
// start stopwatch // start stopwatch
val retVal = pjp.proceed() val retVal = pjp.proceed()
// stop stopwatch // stop stopwatch
@ -893,7 +893,7 @@ Kotlin::
"com.xyz.CommonPointcuts.inDataAccessLayer() && " + "com.xyz.CommonPointcuts.inDataAccessLayer() && " +
"args(accountHolderNamePattern)") // <1> "args(accountHolderNamePattern)") // <1>
fun preProcessQueryPattern(pjp: ProceedingJoinPoint, fun preProcessQueryPattern(pjp: ProceedingJoinPoint,
accountHolderNamePattern: String): Any { accountHolderNamePattern: String): Any? {
val newPattern = preProcess(accountHolderNamePattern) val newPattern = preProcess(accountHolderNamePattern)
return pjp.proceed(arrayOf<Any>(newPattern)) return pjp.proceed(arrayOf<Any>(newPattern))
} }

4
framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc
View File

@ -85,7 +85,7 @@ Kotlin::
} }
@Around("com.xyz.CommonPointcuts.businessService()") // <1> @Around("com.xyz.CommonPointcuts.businessService()") // <1>
fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any { fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any? {
var numAttempts = 0 var numAttempts = 0
var lockFailureException: PessimisticLockingFailureException var lockFailureException: PessimisticLockingFailureException
do { do {
@ -173,7 +173,7 @@ Kotlin::
---- ----
@Around("execution(* com.xyz..service.*.*(..)) && " + @Around("execution(* com.xyz..service.*.*(..)) && " +
"@annotation(com.xyz.service.Idempotent)") "@annotation(com.xyz.service.Idempotent)")
fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any { fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any? {
// ... // ...
} }
---- ----