Prior to this commit, `CreateFileState.onComplete()` would only set
its own `completed` flag. If `fileCreated()` had already switched to
`WritingFileState`, the flag was written to a superseded state and the
completion signal was lost, so the part was never emitted.
This commit re-reads the current state after setting the flag and
delegates to it when it has changed, as `WritingFileState` does.
Fixes gh-37409
- Add tests for @CachePut, @Cacheable, and
@CacheEvict with Flux resubscription in
ReactiveCachingTests, using plain Reactor retry() instead of
@Retryable.
- Reduce the block() timeouts in ReactiveRetryInterceptorTests from 5
seconds to 1 second so that regressions fail faster.
See gh-37403
Fix an existing bug in processPutRequest() affecting `@Cacheable`
and `@CachePut` since 6.1: resubscription after an error hangs while
publish().refCount(2) waits for a second subscriber.
Also fix an unreleased regression introduced by 26de340 (gh-37309) for
`@CacheEvict`, which copied the same pattern into processCacheEvicts().
Create the shared Flux and cache subscriber for each subscription
via Flux.defer(). Add regression tests combining reactive caching
with `@Retryable`.
See gh-37309
Closes gh-37403
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>
This commit fixes the following issues in the reference manual.
- Remove the dangling opening brace from the Kotlin `PlaceOfBirth`
example in example-classes.adoc.
- Use `JsonView::class.java.name` instead of
`JsonView::class.qualifiedName` in the Kotlin examples in
jackson.adoc, since `qualifiedName` is nullable whereas
`Model#set()` does not accept a null key.
- Remove unnecessary semicolons after the empty interface bodies in the
Java examples in jackson.adoc.
Closes gh-37101
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
This commit adds Javadoc content to the `SourceHttpMessageConverter` to
better explain the threat model around XMLserialization/deserialization.
Closes gh-37407
Since commit bda69f0ce2, Eclipse projects use a Java 24 baseline in
spring-core, so Eclipse flags unused lambda parameters (Java 22+) as
warnings. This commit configures the setting to be ignored, as is
already done for unused method parameters.
See gh-37397
Prior to this commit, the Java 21 and Java 24 multi-release sources in
spring-core could not be developed or tested within Eclipse, since an
Eclipse project supports only a single Java compliance level.
This commit configures Eclipse projects that use the multiReleaseJar
plugin with the highest multi-release version as their Java baseline
(Java 24 for spring-core) and includes the corresponding multi-release
source folders. Types which are overridden by a multi-release source
folder are excluded from lower source folders, and higher source
folders are placed first so that the debugger's source lookup resolves
overriding types.
A lower baseline can be configured via the "eclipseJavaBaseline"
project property: for example, -PeclipseJavaBaseline=17.
See gh-37397
Although the multi-release source sets in spring-core were already
excluded from the Eclipse classpath, their Gradle output directories
(such as build/classes/java/java21) were still added as libraries
once they existed, resulting in duplicate types on the classpath.
This commit removes those entries as well, generalizes the exclusion
to any Java release version, revises the outdated comment in
ide.gradle, and documents the limitation in the Eclipse import
instructions.
See gh-37397
This commit updates the Eclipse import instructions for modern versions
of Eclipse IDE and Spring Tools for Eclipse (STS no longer exists as a
product), and notes that the Eclipse IDE for Java Developers package
works as well.
- All references to Buildship have been removed, since we don't use it.
Projects are now imported via "Existing Projects into Workspace"
after running `./gradlew testClasses` and
`./gradlew cleanEclipse eclipse`.
- Obsolete advice has been removed: Kotlin/AJDT compatibility notes,
the manual JAXB source folder step, and the JDK 8 and `MaxPermSize`
hints.
- The `--add-opens` and `-Xshare:off` VM options that the Gradle build
applies to tests are now documented.
- The broken TestNG link has been replaced with the Eclipse Marketplace
one.
Closes gh-37397
Previously, KotlinDelegate.getReturnType() and getGenericReturnType()
resolved the KFunction of every Kotlin method, which materializes the
members of the declaring KClass and is costly at startup. Kotlin
reflection is only needed to resolve the return type of suspending
functions, so both methods now only use it when
KotlinDetector.isSuspendingFunction() returns true.
Closes gh-37300
Signed-off-by: Sébastien Deleuze <sdeleuze@users.noreply.github.com>
This commit fixes syntax errors in Java, Kotlin, and XML examples in
the reference manual, such as Java syntax in Kotlin examples,
unbalanced braces and parentheses, and unclosed XML elements.
Closes gh-37392
Invalidate the cached ID range when commit or auto-commit restoration
fails so subsequent calls obtain a new range from the database.
Closes gh-37322
Signed-off-by: cookie-meringue <daehyeon3351@gmail.com>
This commit updates spring-mvc-test-client.adoc to use valid Kotlin
syntax for a constructor.
Closes gh-37388
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
Move connection cleanup into a finally block so the connection
is closed even if commit or auto-commit restoration fails.
Closes gh-37321
Signed-off-by: cookie-meringue <daehyeon3351@gmail.com>
Prior to this commit, RenderingResponse.from() did not copy the
cookies of the given response, unlike ServerResponse.from().
See gh-22481
Closes gh-37378
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>
Prior to this commit, CONTRIBUTING.md delegated build instructions
and code style to wiki pages, which are planned for removal.
This commit inlines the build, code style and testing guidelines
into CONTRIBUTING.md, aligns them with the current build and
Checkstyle rules, and documents the commit message conventions, the
security policy and the policy on AI-assisted contributions. It also
adds a concise AGENTS.md extract for coding agents, and updates the
README to link to the Build from Source section.
Closes gh-37372
Signed-off-by: Sébastien Deleuze <sdeleuze@users.noreply.github.com>
Prior to this commit, the Javadoc for ConcurrentReferenceHashMap
stated that soft or weak references are used for both keys and values.
However, the references are applied to the internal map entries, each
of which holds strong references to its key and value. Consequently,
an entry may be discarded even if its key and value are still strongly
reachable from elsewhere, which differs from the semantics of
WeakHashMap.
This commit revises the class-level Javadoc as well as the Javadoc for
the ReferenceType constants to document this behavior.
See gh-24253
Closes gh-37357
Signed-off-by: rene.schakmann <rene.schakmann@reetgroup.com>
Prior to this commit, the reference manual mentioned that the JSP
<form:input> tag supports HTML5-specific types, but the Javadoc and
spring-form.tld did not document the `type` attribute at all, and none
of the documentation explained which types are supported or that
<form:password> must be used for password fields.
This commit updates the documentation as follows.
- Document in InputTag, spring-form.tld, and the reference manual that
a `type` can be supplied as a dynamic attribute, that `checkbox` and
`radio` are not supported, and that the bound value is rendered as-is.
- Add notes to InputTag, the reference manual, and spring-form.tld
stating that <form:input type="password"> must not be used and that
<form:password> should be used instead.
- Document in PasswordInputTag, spring-form.tld, and the reference
manual that <form:password> does not render the bound value by default.
Closes gh-37376
Eclipse fails to infer the generic types in XmlEventDecoder and
DefaultWebClient, even though javac and IntelliJ IDEA compile the code
without issues.
This commit introduces explicit type arguments for the calls to
flatMapIterable() and exceptionWrappingFunction() to work around those
bugs.
- Remove redundant super() calls from constructors
- Add missing @Override annotations
- Use switch rules in JdkClientHttpRequest and RfcUriParser
- Use instanceof pattern matching
- Use method references instead of trivial lambda expressions
- Use lambda expressions instead of anonymous inner classes
- Remove unused code and redundant semicolons
- Use braces with if-blocks
This commit adds a test to MergedAnnotationsTests that verifies a
single primitive attribute in a composed annotation can be aliased via
@AliasFor to a primitive array attribute in a meta-annotation.
See gh-37349
Prior to this commit, `adaptForAttribute(Method, Object)` created
the wrapping array from `value.getClass()` when a single non-array
value was provided for an array attribute. This worked for object
array types but failed for primitive array types: wrapping a boxed
value produced a boxed array, which then failed the compatibility
check and threw an `IllegalStateException`.
This commit derives the component type from the declared attribute
type when it is assignable from the value type, falling back to
`value.getClass()` otherwise. The existing adaptation path for
object array types is therefore preserved, and all primitive array
types now accept a single value.
The accompanying test covers single-value wrapping for every array
type declared by ArrayTypes.
Closes gh-37349
Signed-off-by: Chengang Guan <guanchengang@qq.com>
computeIfAbsent registered the case-insensitive key before invoking the
mapping function. If the function returned null or threw an exception,
no mapping was recorded in the target map, but the key registration was
left behind. The map then reported containsKey(key) as true while size()
was 0, keySet() was empty, and get(key) returned null. A later insertion
with a different casing also reused the stale casing of the failed call,
since the existing-key branch resolved to the registered key.
The case-insensitive key is now only looked up up front. For a new key,
it is registered from within the mapping function once a non-null value
has been computed, which is still before the entry is inserted. A null
result or an exception therefore leaves both maps untouched, while a
removeEldestEntry override that evicts the new entry right away still
removes the registration, as it does for put. The existing-key path
keeps computing under the stored casing.
Closes gh-37351
Signed-off-by: junhyeong9812 <pickjog@gmail.com>
KClass instances representing the same class are not guaranteed to be
identical, so the overridden function return type check introduced in
c39edeff15 could wrongly skip unboxing, for example when a class
implements an interface declaring the same suspending function.
See gh-37191
Only unbox value class results when the caller expects their unboxed
representation (non-primitive underlying type, non-nullable underlying
type for nullable return types, and no overridden function with a
different return type), and add related tests.
Cache the unbox method resolution per method and make it accessible
to support non-public value classes.
Closes gh-37191
Unbox Kotlin value class results returned from proxied suspending
methods before returning them to the caller.
Spring AOP interceptor chains expose return values as Object, which
causes Kotlin value class results to be boxed. For suspending functions,
the direct return path expects the unboxed value class representation.
Update both CglibAopProxy and JdkDynamicAopProxy to detect value class
return types and unbox boxed results after coroutine adaptation.
Add tests for suspending methods returning value classes.
See gh-37191
See gh-37155
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
Since Mockito 5.16.1, MockAccess moved from
org.mockito.internal.creation.bytebuddy.MockAccess to
org.mockito.internal.creation.bytebuddy.access.MockAccess.
Consequently, ProxyProcessorSupport.isInternalLanguageInterface() no
longer recognized it, causing an auto-proxied mock created with the
subclass mock maker and proxyTargetClass=false to receive a JDK proxy
that only implements MockAccess instead of a CGLIB proxy of its own
class.
This commit adds a check for the new package name alongside the
existing one, since older Mockito versions may still be on the
classpath.
Closes gh-37342
Prior to this commit, both `CssLinkResourceTransformer` implementations
could fail at runtime in case of invalid CSS links (for example, with
out of bounds exceptions).
This commit skips invalid links and writes them out to the resulting CSS
without any transformation.
Fixes gh-37336
Prior to this commit, `ResponseStatusException` would resolve the
"detail" part of a problem detail response from message codes only
(default or custom ones). If the `reason` given as an argument to the
exception was a custom message, it would be overwritten in the process.
This commit ensures that we use custom reason messages when they don't
resolve as message codes.
Fixes gh-36984
This commit documents the semantics for the `#result` SpEL expression
variable for a method that returns a Flux for @Cacheable and
@CachePut, both of which have always collected such a Flux's values
into a List. For such a method, `#result` refers to that List rather
than the Flux itself.
This commit addresses a number of unrelated inconsistencies in the
documentation as well.
See gh-37309
Prior to this commit, ReactiveCachingHandler.processCacheEvicts()
adapted every reactive return value via Mono.from(), which subscribes
for only the first element and cancels the upstream Publisher. For a
@CacheEvict method that returns a Flux, this silently truncated the
returned sequence to its first element. In addition, the `#result`
variable in `condition` SpEL expressions was bound to only that first
emitted element.
To address that, this commit mirrors the existing multi-value handling
in processPutRequest(). When the adapter reports isMultiValue(), a side
Subscriber is subscribed via publish().refCount(2) that exhausts the
Flux and collects its values into a List for eviction, while the
original, unmodified Flux is returned to the caller. Consequently, the
`#result` variable in `condition` SpEL expressions for a Flux-returning
@CacheEvict method is now the full List of emitted elements rather
than just the first element, making it consistent with @Cacheable and
@CachePut.
This commit also improves spr14235AdaptsToReactorFlux() in
CacheReproTests. Previously it exercised @CacheEvict only with a
single-element Flux and never asserted on the returned sequence. Now it
uses a multi-element Flux and verifies that all elements are both
returned to the caller and visible to the `condition` expression.
Last but not least, this commit documents the aforementioned
`#result`/Flux semantics in @CacheEvict's Javadoc and in the reference
manual, since both were previously invalid or incomplete for this
scenario.
Closes gh-37309
Both target-class tests asserted the target-interface counter,
leaving the intended pointcut unchecked. Assert the target-class
counter in both the XML and @AspectJ variants.
Closes gh-37310
Signed-off-by: itaekyung <taeyun1411@gmail.com>
Juergen Hoeller
Brian Clozel
Sam Brannen
Hyunwoo Jung
Tran Ngoc Nhan
Sébastien Deleuze
머랭
Rene Schakmann
Chengang Guan
김준형
Dmitry Sulman
이태경