Juergen Hoeller
c681614bc2
Merge branch '6.1.x'
2024-06-28 11:36:53 +02:00
Juergen Hoeller
100da83913
Detect ajc markers in superclasses as well (for weaving check)
...
Closes gh-33113
2024-06-28 11:36:17 +02:00
Juergen Hoeller
2aabe238c6
Merge branch '6.1.x'
...
# Conflicts:
# spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
2024-06-06 20:47:02 +02:00
Juergen Hoeller
0ea96b4806
Skip ajc-compiled aspects for ajc-compiled target classes
...
Includes defensive ignoring of incompatible aspect types.
Closes gh-32970
2024-06-06 20:42:07 +02:00
Juergen Hoeller
3305485d1e
Merge branch '6.1.x'
2024-06-05 16:33:44 +02:00
Juergen Hoeller
4f6f2c0d41
Revert to separate get/put steps against method cache for concurrency
...
Closes gh-32958
2024-06-05 16:32:27 +02:00
Juergen Hoeller
f7e7d1b7b0
Merge branch '6.1.x'
2024-06-03 12:47:17 +02:00
Juergen Hoeller
8a84241c1e
Polishing
2024-06-03 12:46:31 +02:00
Juergen Hoeller
624be6d4e6
Report bean creation failure in sortAdvisors as AopConfigException
...
Closes gh-32230
2024-06-03 12:46:14 +02:00
Sam Brannen
dac18a3ff1
Clean up warnings in Gradle build
2024-05-24 13:39:56 +02:00
Juergen Hoeller
0110c5ac82
Merge branch '6.1.x'
2024-05-23 17:08:22 +02:00
Juergen Hoeller
6d7cd9c7dc
Defensive handling of incompatible advice methods
...
This covers AspectJ transaction and caching aspects when encountered by Spring AOP.
Closes gh-32882
See gh-32793
2024-05-23 17:07:51 +02:00
Juergen Hoeller
35278d09ac
Polishing
2024-05-23 16:34:24 +02:00
Juergen Hoeller
2170db6996
Skip expression resolution in getShadowMatch (aligned with 6.1.x)
...
See gh-32793
See gh-32838
2024-05-22 15:39:36 +02:00
Juergen Hoeller
e4f35ebcc5
Merge branch '6.1.x'
2024-05-22 10:01:30 +02:00
Juergen Hoeller
ea596aa211
Select most specific advice method in case of override
...
Closes gh-32865
2024-05-22 10:00:31 +02:00
Juergen Hoeller
f0c6fab39e
Merge branch '6.1.x'
...
# Conflicts:
# gradle.properties
# spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
2024-05-17 12:30:39 +02:00
Juergen Hoeller
617833bec9
Defensively catch and log pointcut parsing exceptions
...
Closes gh-32838
See gh-32793
2024-05-17 12:27:59 +02:00
Juergen Hoeller
9516f87e5e
Merge branch '6.1.x'
2024-05-14 13:48:01 +02:00
Juergen Hoeller
b7aafda872
Polishing
2024-05-14 13:43:35 +02:00
Juergen Hoeller
b3005fcdde
Merge branch '6.1.x'
2024-05-10 13:53:04 +02:00
Juergen Hoeller
a4135bac5c
Leniently ignore unsupported pointcut expression
...
See gh-32793
2024-05-10 13:52:39 +02:00
Juergen Hoeller
b2d43f54e0
Merge branch '6.1.x'
2024-05-10 12:29:49 +02:00
Juergen Hoeller
bf08e0c1b4
Polishing
2024-05-10 12:27:29 +02:00
Juergen Hoeller
9202c0ad41
Accept ajc-compiled @Aspect classes for Spring AOP proxy usage
...
Closes gh-32793
2024-05-10 12:27:12 +02:00
Juergen Hoeller
f1a1190700
Merge branch '6.1.x'
...
# Conflicts:
# framework-docs/modules/ROOT/pages/data-access/transaction/declarative/annotations.adoc
2024-04-30 15:47:48 +02:00
Juergen Hoeller
cbda46984c
Polishing
2024-04-30 15:46:28 +02:00
Stéphane Nicoll
87855e2d34
Clear ShadowMatch instances when they are no longer needed
...
This commit gathers the ShadowMatch instances that AspectJ requires in
a dedicated class that can be used to clear the instances when they are
no longer required.
As those are mainly triggered via AspectJAwareAdvisorAutoProxyCreator,
it now implements the necessary callbacks to clear the cache.
Closes gh-12334
2024-04-29 16:25:11 +02:00
Juergen Hoeller
77c6f160fe
Merge branch '6.1.x'
...
# Conflicts:
# spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
# spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
# spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java
2024-04-10 18:29:48 +02:00
Juergen Hoeller
39cd31613b
Polishing
2024-04-10 18:06:32 +02:00
Juergen Hoeller
f6089afd0e
Use ClassLoaderAwareGeneratorStrategy with UndeclaredThrowableStrategy delegate
...
See gh-32469
2024-04-10 13:23:24 +02:00
Mikaël Francoeur
561583842f
Consistent handling of undeclared checked exceptions in CGLIB proxies ( #32469 )
...
Co-authored-by: hengyunabc <hengyunabc@gmail.com >
Co-authored-by: Mikaël Francoeur <mikael.francoeur@ticketmaster.com >
2024-04-10 12:11:33 +02:00
Sébastien Deleuze
bb04c6b1f3
Merge branch '6.1.x'
2024-04-09 15:22:58 +02:00
Sébastien Deleuze
23696b7db8
Add a classpath check for AOP Coroutines/Reactive conversion
...
Closes gh-32599
2024-04-09 15:21:21 +02:00
Sébastien Deleuze
0c42874629
Merge branch '6.1.x'
2024-04-05 14:33:20 +02:00
Sébastien Deleuze
4a7c24d90f
Refine null-safety
...
See gh-32475
2024-04-05 14:30:50 +02:00
Sébastien Deleuze
2fea3d7921
Merge branch '6.1.x'
2024-03-26 15:41:46 +01:00
Sébastien Deleuze
290a41d398
Refine null-safety in more modules
...
This commit refines the null-safety in all remaining modules
except spring-test.
See gh-32475
2024-03-26 15:39:18 +01:00
Sébastien Deleuze
5b660da52d
Perform NullAway build-time checks in more modules
...
This commit enables null-safety build-time checks in:
- spring-jdbc
- spring-r2dbc
- spring-orm
- spring-beans
- spring-aop
See gh-32475
2024-03-26 09:59:30 +01:00
Sébastien Deleuze
3b4f8dbb8e
Merge branch '6.1.x'
2024-03-26 09:47:09 +01:00
Sébastien Deleuze
1b563f8ba4
Refine null-safety in more modules
...
This commit refines the null-safety in:
- spring-jdbc
- spring-r2dbc
- spring-orm
- spring-beans
- spring-aop
See gh-32475
2024-03-26 09:46:34 +01:00
Juergen Hoeller
e58ea0d945
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
2024-03-19 10:06:48 +01:00
Juergen Hoeller
c531a8a705
Nullability refinements and related polishing
...
See gh-32475
2024-03-19 09:58:44 +01:00
Stéphane Nicoll
e53ed3e3c6
Merge branch '6.1.x'
2024-03-09 16:03:04 +01:00
Stéphane Nicoll
4983a802a7
Polish "Fix Javadoc"
...
See gh-32403
2024-03-09 16:02:01 +01:00
Maksim Sasnouski
abdccffa39
Fix Javadoc
...
This commit fixes various Javadoc issues across the code base.
See gh-32403
2024-03-09 16:02:00 +01:00
Juergen Hoeller
79c54098ab
Merge branch '6.1.x'
2024-03-04 23:49:55 +01:00
Juergen Hoeller
4300fec023
Restore ability to return original method at ClassUtils level as well
...
Closes gh-32365
2024-03-04 23:48:26 +01:00
Juergen Hoeller
dc6c96de0a
Merge branch '6.1.x'
...
# Conflicts:
# spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
# spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
# spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
2024-03-04 22:50:22 +01:00
Juergen Hoeller
24759a75f4
Restore ability to return original method for proxy-derived method
...
Closes gh-32365
2024-03-04 22:48:46 +01:00
