diff --git a/framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc b/framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc index 94adb81696..30f2bc8dc0 100644 --- a/framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc +++ b/framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc @@ -176,7 +176,7 @@ Kotlin:: @AfterReturning( pointcut = "execution(* com.xyz.dao.*.*(..))", returning = "retVal") - fun doAccessCheck(retVal: Any) { + fun doAccessCheck(retVal: Any?) { // ... } } @@ -448,7 +448,7 @@ Kotlin:: class AroundExample { @Around("execution(* com.xyz..service.*.*(..))") - fun doBasicProfiling(pjp: ProceedingJoinPoint): Any { + fun doBasicProfiling(pjp: ProceedingJoinPoint): Any? { // start stopwatch val retVal = pjp.proceed() // stop stopwatch @@ -888,7 +888,7 @@ Kotlin:: "com.xyz.CommonPointcuts.inDataAccessLayer() && " + "args(accountHolderNamePattern)") // <1> fun preProcessQueryPattern(pjp: ProceedingJoinPoint, - accountHolderNamePattern: String): Any { + accountHolderNamePattern: String): Any? { val newPattern = preProcess(accountHolderNamePattern) return pjp.proceed(arrayOf(newPattern)) } diff --git a/framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc b/framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc index 03cb9d102e..896086c928 100644 --- a/framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc +++ b/framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc @@ -85,7 +85,7 @@ Kotlin:: } @Around("com.xyz.CommonPointcuts.businessService()") // <1> - fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any { + fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any? { var numAttempts = 0 var lockFailureException: PessimisticLockingFailureException do { @@ -173,7 +173,7 @@ Kotlin:: ---- @Around("execution(* com.xyz..service.*.*(..)) && " + "@annotation(com.xyz.service.Idempotent)") - fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any { + fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any? { // ... } ---- diff --git a/framework-docs/modules/ROOT/pages/core/aop/schema.adoc b/framework-docs/modules/ROOT/pages/core/aop/schema.adoc index fd19d9ecc6..c51ad3e976 100644 --- a/framework-docs/modules/ROOT/pages/core/aop/schema.adoc +++ b/framework-docs/modules/ROOT/pages/core/aop/schema.adoc @@ -435,7 +435,7 @@ Kotlin:: + [source,kotlin,indent=0,subs="verbatim",role="secondary"] ---- - fun doBasicProfiling(pjp: ProceedingJoinPoint): Any { + fun doBasicProfiling(pjp: ProceedingJoinPoint): Any? { // start stopwatch val retVal = pjp.proceed() // stop stopwatch @@ -554,7 +554,7 @@ Kotlin:: class SimpleProfiler { - fun profile(call: ProceedingJoinPoint, name: String, age: Int): Any { + fun profile(call: ProceedingJoinPoint, name: String, age: Int): Any? { val clock = StopWatch("Profiling for '$name' and '$age'") try { clock.start(call.toShortString()) @@ -890,7 +890,7 @@ Kotlin:: this.order = order } - fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any { + fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any? { var numAttempts = 0 var lockFailureException: PessimisticLockingFailureException do { diff --git a/framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc b/framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc index 10fdac6dca..f9b6b39887 100644 --- a/framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc +++ b/framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc @@ -493,7 +493,7 @@ Kotlin:: class ProfilingAspect { @Around("methodsToBeProfiled()") - fun profile(pjp: ProceedingJoinPoint): Any { + fun profile(pjp: ProceedingJoinPoint): Any? { val sw = StopWatch(javaClass.simpleName) try { sw.start(pjp.getSignature().getName())