Commit Graph

52686 Commits

Author SHA1 Message Date
Johnny Lim
a39e1c4a09 Polish
Signed-off-by: Johnny Lim <izeye@naver.com>

See gh-44034
2025-01-31 17:04:58 +01:00
Stéphane Nicoll
a33b700b12 Merge branch '3.4.x' 2025-01-31 17:04:48 +01:00
Stéphane Nicoll
dc9aa6d168 Polish
See gh-44034
2025-01-31 17:04:33 +01:00
Stéphane Nicoll
4c7b8ef57b Merge branch '3.4.x'
Closes gh-44036
2025-01-31 13:46:57 +01:00
Stéphane Nicoll
a3f997d5d5 Merge branch '3.3.x' into 3.4.x
Closes gh-44035
2025-01-31 13:46:21 +01:00
Stéphane Nicoll
7e79a86684 Merge pull request #44032 from ashishkujoy
* pr/44032:
  Fix typo in Running Your Application

Closes gh-44032
2025-01-31 13:46:13 +01:00
Ashish Kumar
e41d697040 Fix typo in Running Your Application
See gh-44032

Signed-off-by: Ashish Kumar <34642693+ashishkujoy@users.noreply.github.com>
2025-01-31 13:45:37 +01:00
Moritz Halbritter
8536520e5e Ignore unbindable datasource datasource properties
Closes gh-43988
2025-01-31 10:45:20 +01:00
Moritz Halbritter
61d7f3783e Implement config data loader to load from environment variables
The config data loader supports the env: prefix and also accepts
extension hints.

Example: env:VAR1[.properties] reads the environment
variable 'VAR1' in properties format (using the
PropertiesPropertySourceLoader).

The PropertySourceLoaders are loaded via spring.factories.

Also adds a smoke test to test it end to end.

Closes gh-41609
2025-01-31 09:33:28 +01:00
Phillip Webb
910d57ed90 Merge branch '3.4.x' 2025-01-30 20:17:43 -08:00
Phillip Webb
965e587de3 Polish 2025-01-30 20:17:39 -08:00
Phillip Webb
4eab166990 Merge branch '3.4.x'
Closes gh-44031
2025-01-30 18:42:42 -08:00
Phillip Webb
b3ca68c17e Upgrade to asciidoctor-extensions 1.0.0-alpha.16
Closes gh-44030
2025-01-30 18:42:26 -08:00
Phillip Webb
1b63d05edd Merge branch '3.4.x' 2025-01-30 18:38:45 -08:00
Phillip Webb
1c3cbb411c Fix missing javadoc reference 2025-01-30 18:38:29 -08:00
Phillip Webb
7ec22d8668 Allow @ConfigurationPropertiesBinding to work with lambdas
Update `ConversionServiceDeducer` so that lambdas can be used with
`@ConfigurationPropertiesBinding` annotated `@Bean` methods.

This commit also allows more converter types to be detected.

Closes gh-44018
2025-01-30 16:03:26 -08:00
Phillip Webb
4eae8a096c Merge pull request #22885 from viviel
* pr/22885:
  Polish 'Support lambda based converters via bean method signature generics'
  Support lambda based converters via bean method signature generics

Closes gh-22885
2025-01-30 15:05:39 -08:00
Phillip Webb
dcb2dd597e Polish 'Support lambda based converters via bean method signature generics'
See gh-22885
2025-01-30 15:04:24 -08:00
viviel
2921b1428e Support lambda based converters via bean method signature generics
Update `ApplicationConversionService` to support beans that are
implemented using lambdas. The updated code now uses the result of
`beanDefinition.getResolvableType()` if the type itself has unresolvable
generics.

See gh-22885
2025-01-30 15:00:49 -08:00
Andy Wilkinson
1bee5f3942 Merge branch '3.4.x'
Closes gh-44026
2025-01-30 12:12:08 +00:00
Andy Wilkinson
df32e21078 Merge branch '3.3.x' into 3.4.x
Closes gh-44025
2025-01-30 12:10:50 +00:00
Andy Wilkinson
5cd378da38 Merge pull request #44021 from nosan
* gh-44021:
  Polish "Update SpringBootJoranConfigurator to use proper GraalVM format"
  Update SpringBootJoranConfigurator to use proper GraalVM format

Closes gh-44021
2025-01-30 12:09:59 +00:00
Andy Wilkinson
01ec0c4fe0 Polish "Update SpringBootJoranConfigurator to use proper GraalVM format"
See gh-44021
2025-01-30 12:02:20 +00:00
Dmytro Nosan
d9f441d620 Update SpringBootJoranConfigurator to use proper GraalVM format
Before this commit, the generated name for the inner class had the
wrong format <package>.<parent>.<child> (canonical name).
GraalVM expects $ to separate the parent from the inner class.

This commit updates SpringBootJoranConfigurator to generate
an appropriate format for a class name. Specifically, an inner class
should be separated by a dollar sign, not a dot.

See gh-44021

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-30 12:00:33 +00:00
Moritz Halbritter
7ab89d1b16 Merge branch '3.4.x'
Closes gh-44023
2025-01-30 10:25:18 +01:00
Moritz Halbritter
dcd4b7cb57 Merge branch '3.3.x' into 3.4.x
Closes gh-44022
2025-01-30 10:25:02 +01:00
Moritz Halbritter
7f9b4c6ff6 Document Kubernetes' preStop sleep
Closes gh-43830
2025-01-30 10:22:25 +01:00
Phillip Webb
c09c454411 Merge pull request #44014 from izeye
* pr/44014:
  Restore shouldNotRegisterStructuredLoggingJsonMembersCustomizerRuntimeHints()

Closes gh-44014
2025-01-29 12:51:56 -08:00
Johnny Lim
a2217e85fe Restore shouldNotRegisterStructuredLoggingJsonMembersCustomizerRuntimeHints()
See gh-44014

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-29 12:51:37 -08:00
Phillip Webb
18a89f6007 Fix 'logging.structured.json.customizer' metadata
See gh-43368
2025-01-29 11:53:01 -08:00
Phillip Webb
921c362b97 Add 'spring.r2dbc.pool.acquire-retry' property
Add a new property to configure the pool acquire retry value.

Closes gh-44017
2025-01-29 11:48:32 -08:00
Phillip Webb
c1cb4c51ed Use a single customizer property for JSON logging
Update `StructuredLoggingJsonProperties` no that only a single
`customizer` property is supported.

See gh-43368
2025-01-29 11:26:22 -08:00
Moritz Halbritter
035c80aa5b Deprecate SignalFX tests
See gh-43962
2025-01-29 13:11:14 +01:00
Moritz Halbritter
58cc3a0d3d Deprecate SignalFX support
Closes gh-43962
2025-01-29 10:41:24 +01:00
Phillip Webb
a13fe0b565 Make @ConditionalOn[Boolean]Property @Repeatable
Update `ConditionalOnProperty`, `ConditionalOnBooleanProperty`
and `OnPropertyCondition` to support `@Repeatable`.

Closes gh-2541
2025-01-28 21:13:53 -08:00
Phillip Webb
f32b29e166 Don't use mocks for SystemStatusListenerTests
See gh-44012
2025-01-28 21:13:18 -08:00
Phillip Webb
eeee7d9d7c Merge pull request #44013 from izeye
* pr/44013:
  Remove duplicate test

Closes gh-44013
2025-01-28 20:20:32 -08:00
Johnny Lim
36eeb3564e Remove duplicate test
Remove shouldNotRegisterStructuredLoggingJsonMembersCustomizer...
RuntimeHints since it duplicates shouldNotRegisterStructuredLogging...
JsonMembersCustomizerRuntimeHintsWhenCustomizerIsNotSet

See gh-44013

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-28 20:19:18 -08:00
Phillip Webb
3fe4c5a692 Merge pull request #44012 from nosan
* pr/44012:
  Add more tests for SystemStatusListener and LogbackLoggingSystem

Closes gh-44012
2025-01-28 20:16:56 -08:00
Dmytro Nosan
213b2ea9bc Add more tests for SystemStatusListener and LogbackLoggingSystem
See gh-44012

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-28 20:16:38 -08:00
Phillip Webb
b722430efe Merge pull request #29500 from VladislavSevruk
* pr/29500:
  Polish @ConditionalOnBean and @ConditionalOnMissingBean tests
  Add ConditionalOnBean support for generic @Bean return types

Closes gh-29500
2025-01-28 20:14:38 -08:00
Phillip Webb
3911ca7c8e Polish @ConditionalOnBean and @ConditionalOnMissingBean tests
Combine generic and regular tests and apply some polish.

See gh-29500
2025-01-28 20:14:16 -08:00
Uladzislau Seuruk
aa7864ea38 Add ConditionalOnBean support for generic @Bean return types
Update `ConditionalOnBean` so support generics when resolving the
`@Bean` method.

See gh-29500

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-01-28 20:14:08 -08:00
Phillip Webb
fcad1fa12a Merge pull request #43931 from nosan
* pr/43931:
  Polish SystemStatusListener

Closes gh-43931
2025-01-28 12:03:24 -08:00
Dmytro Nosan
4878fc2a28 Polish SystemStatusListener
See gh-43931

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-28 12:03:11 -08:00
Phillip Webb
8e15317e89 Merge pull request #43931 from nosan
* pr/43931:
  Refine `SystemStatusListener` superfluous output fix
  Fix SystemStatusListener to prevent superfluous output

Closes gh-43931
2025-01-28 11:17:53 -08:00
Phillip Webb
c884529561 Refine SystemStatusListener superfluous output fix
Change `SystemStatusListener` to a `OnConsoleStatusListener` to
ensure that it cannot be added twice from different threads.

Also add a local `retrospectivePrint()` that is used for non-debug
output that will print ERROR and WARN status, but not INFO.

See gh-43931
2025-01-28 11:16:00 -08:00
Dmytro Nosan
6ba8e9b089 Fix SystemStatusListener to prevent superfluous output
Fix `SystemStatusListener` so that superfluous output is not
printed when starting an application. This change ensures that
the `SystemStatusListener` is not added twice, and that
retrospective logging only occurs when `debug` is true.

See gh-43931

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-28 11:15:55 -08:00
Brian Clozel
fc01b011d5 Merge branch '3.4.x' 2025-01-28 17:14:23 +01:00
Brian Clozel
e01a23b1fe Merge branch '3.3.x' into 3.4.x
Closes gh-
2025-01-28 17:13:47 +01:00