Sam Brannen
f12d81f791
Merge branch '6.0.x'
2023-06-22 11:36:10 +02:00
Anton Gubenko
9b5cbc1334
Fix link text from "null" to "Component Classes" in Testing chapter
...
Closes gh-30714
2023-06-22 11:35:23 +02:00
Sam Brannen
49547fc710
Merge branch '6.0.x'
...
# Conflicts:
# build.gradle
2023-06-22 11:32:39 +02:00
Johnny Lim
40e378a5a6
Upgrade to me.champeau.jmh 0.7.1
...
Closes gh-30690
2023-06-22 11:31:32 +02:00
Brian Clozel
ea8fdd17c8
Upgrade to JDK21 EA build 27
2023-06-22 08:43:03 +02:00
Juergen Hoeller
a6566bfd5f
Merge branch '6.0.x'
2023-06-21 18:53:15 +02:00
Juergen Hoeller
8eb0a0b94e
Upgrade to Tomcat 10.1.10, Netty 4.1.94, Mockito 5.4
2023-06-21 18:52:02 +02:00
Juergen Hoeller
09cf489c6b
Test for supportsEventType mismatch with unrelated event type
...
See gh-30712
2023-06-21 18:24:38 +02:00
Sam Brannen
abefc0aba0
Merge branch '6.0.x'
2023-06-21 17:54:16 +02:00
Sam Brannen
9a5290ea27
Apply project conventions to formatting
2023-06-21 17:50:42 +02:00
Sam Brannen
03b304f05c
Merge branch '6.0.x'
2023-06-21 17:37:04 +02:00
Sam Brannen
b3176208e2
Remove invalid Javadoc link
2023-06-21 17:36:36 +02:00
Juergen Hoeller
54e25e2fa6
Merge branch '6.0.x'
2023-06-21 17:18:55 +02:00
Juergen Hoeller
1dfe737d0e
Avoid ResolvableType creation for interface/superclass check
...
See gh-30713
2023-06-21 17:17:58 +02:00
Juergen Hoeller
dc2f513619
Correct supportsEventType checks for payload events
...
See gh-30712
2023-06-21 17:17:03 +02:00
Sam Brannen
83447663b4
Merge branch '6.0.x'
2023-06-21 16:21:34 +02:00
Sam Brannen
0eb33d09ac
Ensure package-private init/destroy methods are always invoked
...
Prior to this commit, if an init/destroy method was package-private and
declared in a superclass in a package different from the package in
which the registered bean resided, a local init/destroy method with the
same name would effectively "shadow" the method from the different
package, resulting in only the local init/destroy method being invoked.
This commit addresses this issue by tracking package-private init
methods from different packages using their fully-qualified method
names, analogous to the existing support for private init/destroy
methods.
Closes gh-30718
2023-06-21 16:18:19 +02:00
Sam Brannen
f67f98a1a7
Polishing
2023-06-21 15:56:50 +02:00
Stephane Nicoll
b581a79eed
Merge branch '6.0.x'
2023-06-21 14:51:00 +02:00
Stephane Nicoll
6c42f374c8
Consistently set target type in generated code
...
Previously, a bean definition that is optimized AOT could have
different metadata based on whether its resolved type had a generic or
not. This is due to RootBeanDefinition taking either a Class or a
ResolvableType doing fundamentally different things. While the former
sets the bean class which is to little use with an instance supplier,
the latter specifies the target type of the bean.
This commit sets the target type of the bean, using the existing
setter methods that take either a class or a ResolvableType and set the
same attribute consistently.
Closes gh-30689
2023-06-21 14:45:19 +02:00
Sam Brannen
6535614d78
Merge branch '6.0.x'
2023-06-21 14:22:11 +02:00
Sam Brannen
4879b56bb9
Test status quo for private init/destroy methods in AOT mode
...
This commit only tests which init/destroy methods are "registered" in
AOT mode.
This commit does NOT test that the registered methods can actually be
invoked in AOT mode: that will be addressed in a separate commit.
See gh-30692
2023-06-21 14:19:13 +02:00
Sam Brannen
2fd83aa764
Polish InitDestroyAnnotationBeanPostProcessor internals, etc.
2023-06-21 14:19:00 +02:00
Juergen Hoeller
fa82683ce2
Merge branch '6.0.x'
2023-06-21 13:16:47 +02:00
Juergen Hoeller
93218a06ba
Cache hasUnresolvableGenerics result for repeated checks
...
Closes gh-30713
2023-06-21 13:16:04 +02:00
Juergen Hoeller
714c3c59eb
Accept unresolvable generics as long as raw event class matches
...
Closes gh-30712
2023-06-21 13:15:35 +02:00
Juergen Hoeller
1a201cd180
Merge branch '6.0.x'
...
# Conflicts:
# spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java
2023-06-21 09:51:11 +02:00
Juergen Hoeller
adcdefce43
Upgrade to Jetty 12.0.0.beta2
2023-06-21 09:49:26 +02:00
Juergen Hoeller
049a024dea
Deprecate RootBeanDefinition(ResolvableType) constructor
...
Closes gh-30704
2023-06-21 09:48:00 +02:00
Juergen Hoeller
20bbebb299
Ensure Spring LogFactory contains all public methods from Apache LogFactory
...
Closes gh-30668
2023-06-21 09:47:16 +02:00
Maarten Coene
24457660e3
Ensure Spring `LogFactory` contains all public methods from Apache `LogFactory` ( #30668 )
2023-06-21 09:29:58 +02:00
Juergen Hoeller
f1fb8cf03e
Polishing
2023-06-20 22:53:12 +02:00
Juergen Hoeller
18c6aceee7
Consistent guard for Reactive Streams presence
...
Closes gh-30707
2023-06-20 22:51:23 +02:00
Sébastien Deleuze
24ddceea47
Merge branch '6.0.x'
2023-06-20 20:57:33 +02:00
Sébastien Deleuze
26f006509f
Polish CoWebFilter javadoc
2023-06-20 20:56:47 +02:00
Sébastien Deleuze
82ec28b369
Add a CoExchangeFilterFunction for WebClient
...
This commit introduces a Kotlin-specific implementation
of the ExchangeFilterFunction interface that allows for
using coroutines, similar to what CoWebFilter does on
server-side.
Closes gh-30650
2023-06-20 20:54:38 +02:00
rstoyanchev
db19f6395d
Polishing
...
Closes gh-29768
2023-06-20 17:18:40 +01:00
Atsushi Yoshikawa
b677ff20fe
AbstractMessageConverter delegates null headers
...
See gh-29768
2023-06-20 17:18:40 +01:00
rstoyanchev
b98c1ec36a
Apply default value in case of null after conversion
...
Closes gh-29550
2023-06-20 17:18:40 +01:00
Stephane Nicoll
37ff9792be
Merge branch '6.0.x'
2023-06-20 17:42:40 +02:00
Stephane Nicoll
089503aab7
Fix typo
2023-06-20 17:32:24 +02:00
Stephane Nicoll
74155e3d88
Do not invoke AspectJ hints generation if AspectJ is not present
...
See gh-28711
2023-06-20 17:26:08 +02:00
Sam Brannen
3344ab909b
Merge branch '6.0.x'
2023-06-20 15:49:13 +02:00
Sam Brannen
564f33d5ef
Polishing
2023-06-20 15:47:41 +02:00
Stephane Nicoll
828b39587f
Merge branch '6.0.x'
2023-06-20 15:21:37 +02:00
Stephane Nicoll
83acd5b050
Document JPA configuration best practices with AOT
...
Closes gh-30498
2023-06-20 15:21:12 +02:00
Sam Brannen
0605172d4d
Merge branch '6.0.x'
...
# Conflicts:
# spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
2023-06-20 13:29:06 +02:00
Sam Brannen
67798a7b52
Fix CSS classes in Javadoc HTML tables due to upgrade to Java 17
...
Closes gh-30701
2023-06-20 13:24:03 +02:00
rstoyanchev
089d938e15
Set throwExceptionIfNoHandlerFound=true and deprecate
...
Closes gh-29491
2023-06-19 17:18:09 +01:00
rstoyanchev
c00508d6cf
Raise and handle NoResourceFoundException
...
See gh-29491
2023-06-19 17:18:08 +01:00