Commit Graph
426 Commits
Author SHA1 Message Date
Andy Wilkinson 616e64b4ae Merge branch '4.0.x' into 4.1.x
Closes gh-51908
2026-10-01 09:52:47 +01:00
Andy Wilkinson f6aa92821d Fix BasicJsonParser's escape handling in nested elements
BasicJsonParser tokenizes JSON into map entries (key-value pairs)
and list entries (values). As part of this, any escaped characters
are unescaped. When the values are themselves maps or lists, they
are tokenized again. This multi-pass approach with every pass
performing unescaping causes the escaped characters to be handled
incorrectly.

This commit updates BasicJsonParser to leave escape characters in
place when its parsing characters nested within a list or map. The
escaping is now only considered when parsing a scalar value. This
ensures that unescaping is only performed once.

Fixes gh-51907
2026-10-01 09:08:42 +01:00
Phillip Webb 80a2d49953 Merge branch '4.0.x' into 4.1.x
Closes gh-51894
2026-09-28 09:18:06 -07:00
Phillip Webb d9df34b827 Polish 'Fix formatting a zero period with a weeks unit'
See gh-51892
2026-09-28 07:54:19 -07:00
Yingzi Zhang b21366db6d Fix formatting a zero period with a weeks unit
See gh-51892

Signed-off-by: Yingzi Zhang <yingzizhang1205@gmail.com>
2026-09-28 07:53:16 -07:00
Stéphane Nicoll dda41fef36 Merge branch '4.0.x' into 4.1.x
Closes gh-51884
2026-09-28 11:07:14 +02:00
Tran Ngoc Nhan 3fe8d42485 Remove unnecessary cast to null
See gh-51850

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-28 10:54:13 +02:00
Phillip Webb e45e629145 Merge branch '4.0.x' into 4.1.x 2026-09-15 20:44:24 -07:00
Phillip Webb 9fd0762b3c Fix javadoc empty <p> tag warnings 2026-09-15 20:33:44 -07:00
Andy Wilkinson 7612f4a222 Merge branch '4.0.x' into 4.1.x
Closes gh-51763
2026-09-15 13:03:03 +01:00
Hyunwoo Jung ed63da9f5d Fix duplicated tests
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51722
2026-09-15 12:48:22 +01:00
Stéphane Nicoll 18292d400c Merge branch '4.0.x' into 4.1.x
Closes gh-51628
2026-09-08 16:57:00 +02:00
Stéphane Nicoll b1e91c942e Add support for creating a container from a TestImage value
This commit improves TestImage so that an explicit image can trigger
the creation of the container, with optional additional setup. This
removes the need of creating additional container types for images that
have multiple flavors, and to please the static method that can only
create a container based on a single match.

Closes gh-51082
2026-09-08 16:46:48 +02:00
Andy Wilkinson 50350d0c83 Merge branch '4.0.x' into 4.1.x
Closes gh-51606
2026-09-07 12:20:30 +01:00
Hyunwoo Jung 528c8bd1ea Fix typos
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51590
2026-09-07 11:53:30 +01:00
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
JaeHyunAn 87cadf2c9c Fix corruption of supplementary characters in AppendableByteArray
A high surrogate left unconsumed by the encoder was dropped between
append calls, so surrogate pairs written a character at a time by
JsonValueWriter were replaced with `?`.

See gh-51464

Signed-off-by: JaeHyunAn <98042706+yyuneu@users.noreply.github.com>
2026-09-04 13:43:50 +01:00
Andy Wilkinson 61a62d56d8 Merge branch '4.0.x' into 4.1.x
Closes gh-51584
2026-09-04 12:58:36 +01:00
Manu Sridharan 1c50b1cb7c Fix new warnings from NullAway 0.14.1
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51507
2026-09-04 12:56:34 +01:00
Andy Wilkinson c38c15b3b7 Merge branch '4.0.x' into 4.1.x
Closes gh-51576
2026-09-04 09:53:28 +01:00
Vladimir Sitnikov ff3086700b Fix unrecognized JSpecify nullable annotations
Signed-off-by: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>

See gh-51555
2026-09-04 09:40:47 +01:00
Andy Wilkinson 4c5ed7e087 Merge branch '4.0.x' into 4.1.x
Closes gh-51574
2026-09-04 09:35:30 +01:00
kdomo 3d037f9df6 Correct Assert messages that name the wrong parameter
Three Assert messages named a parameter that does not exist on the
method. In each case the correct name is already used by neighbouring
code in the same class.

Signed-off-by: kdomo <dongho5088@naver.com>

See gh-51568
2026-09-04 09:10:05 +01:00
Andy Wilkinson 8350f147ff Merge branch '4.0.x' into 4.1.x
Closes gh-51572
2026-09-04 08:43:15 +01:00
Andy Wilkinson 10190c7cc7 Fix race condition in ProcessRunnerTests
There's a race between destruction of the process completing and the
test checking that the process has been destroyed. When the test
wins the race, it fails.

This commit removes the race condition by updating the test to wait
until the process has been destroyed.

Closes gh-51571
2026-09-04 08:40:35 +01:00
Andy Wilkinson 8e7128730f Merge branch '4.0.x' into 4.1.x
Closes gh-51544
2026-09-02 14:18:14 +01:00
Andy Wilkinson d6c2e687b0 Polish "Use constructor injection in classes that partipate in @Import"
See gh-51490

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-02 14:16:07 +01:00
Andy Wilkinson 94ca058844 Merge branch '4.0.x' into 4.1.x
Closes gh-51538
2026-09-02 09:12:54 +01:00
Andy Wilkinson bf8731693b Polish "Improve Docker Compose ProcessRunner's handling of failure cases"
See gh-50963

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-02 09:11:53 +01:00
Sebastien Tardif 27e96308ed Improve Docker Compose ProcessRunner's handling of failure cases
Release the output reader latch in a finally block so a failing stream
read or output consumer cannot leave ProcessRunner.run blocked on
CountDownLatch.await after the child process has exited.

Destroy the child process when waitFor is interrupted so Docker Compose
commands are not left running as orphans.

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>

See gh-50963
2026-09-02 09:02:00 +01:00
Phillip Webb 914f39384c Merge branch '4.0.x' into 4.1.x
Closes gh-51454
2026-08-25 14:07:23 -07:00
Phillip Webb 5a21e0d698 Upgrade to spring-javaformat 0.0.48
Closes gh-51452
2026-08-25 13:58:58 -07:00
Phillip Webb 40c527aeb0 Merge branch '4.0.x' into 4.1.x
Closes gh-51448
2026-08-25 12:39:46 -07:00
Manu Sridharan 23fc7dd183 Fix warning from NullAway 0.14.0 related to override
See gh-51409

Signed-off-by: Manu Sridharan <msridhar@gmail.com>
2026-08-25 12:29:02 -07:00
Phillip Webb 299c7d9125 Merge branch '4.0.x' into 4.1.x
Closes gh-51445
2026-08-25 12:08:53 -07:00
chisanw 857d1b7a8a Fix typos in service connection documentation
See gh-51431

Signed-off-by: chisanw <keuye06380618@gmail.com>
2026-08-25 12:07:13 -07:00
Phillip Webb e4870664f1 Merge branch '4.0.x' into 4.1.x 2026-08-24 19:09:52 -07:00
Phillip Webb 068bb037bf Change code to make Eclipse compiler happy
Extract a local variable to fix compiler error that only seems to
happen in Eclipse.
2026-08-24 19:07:53 -07:00
Andy Wilkinson b1454cd2de Merge branch '4.0.x' into 4.1.x 2026-08-24 15:52:12 +01:00
Andy Wilkinson 6dbc7e9a51 Use method on String to identify Java 27
At the time of writing, https://javaalmanac.io lists
EnumSet.spliterator as being new in Java 27, but that's not the case.

This commit switches to using String.encodedLength(Charset) instead.
This method is new in Java 27 and also aligns with the existing
TWENTY_SIX value that already uses a method on String for version
identification.

See gh-51422
2026-08-24 15:47:34 +01:00
Andy Wilkinson 975c591a97 Merge branch '4.0.x' into 4.1.x 2026-08-24 15:31:45 +01:00
Andy Wilkinson 6e58a6ff8b Polish
See gh-51422
2026-08-24 15:31:30 +01:00
Andy Wilkinson feb66aa843 Merge branch '4.0.x' into 4.1.x
Closes gh-51426
2026-08-24 15:21:55 +01:00
Andy Wilkinson ff153f21d8 Add TWENTY_SEVEN to JavaVersion
Closes gh-51422
2026-08-24 14:51:52 +01:00
Stéphane Nicoll 4ee67a3f6b Merge branch '4.0.x' into 4.1.x
Closes gh-51418
2026-08-24 08:26:06 +02:00
Stéphane Nicoll 43d3cf57eb Close reader in GsonTester
This harmonizes how JSON marshaller testers operate on a stream. Also
added tests that checks the source is closed as expected for all
implementations.

Closes gh-51417
2026-08-24 08:21:51 +02:00
Stéphane Nicoll 515810853f Merge branch '4.0.x' into 4.1.x
Closes gh-51415
2026-08-24 08:08:03 +02:00
Stéphane Nicoll 5402f5b43f Polish "Release file handle when comparing AOT file content"
See gh-51398
2026-08-24 08:05:45 +02:00
dlwldn30 4a1abb9617 Release file handle when comparing AOT file content
RequireNewOrMatchingContentFileHandler reads the already generated file
through content.getInputStream().readAllBytes(). That method does not
close the stream, and the stream is never assigned, so it cannot
be closed at all.

During AOT processing the content is a FileSystemResource, so each
comparison leaks a file handle. FileSystemGeneratedFiles already uses
try-with-resources when it consumes an InputStreamSource.

Read the existing content inside a try-with-resources block.

See gh-51398

Signed-off-by: dlwldn30 <dlwldn30@naver.com>
2026-08-24 08:05:38 +02:00