Andy Wilkinson
b240c810a8
Fix @ConfigurationProperties on @Bean methods without metadata caching
...
Due to a current limitation of Spring Framework, when bean metadata
caching is disabled, a merged bean definition may have a null
resolved factory method that would have been non-null if bean metadata
caching was enabled. Configuration property binding for @Bean methods
annotated with @ConfigurationProperties relied upon the resolved
factory method being enabled to find the @ConfigurationProperties
annotation and trigger property binding. As a result, when bean
metadata caching is disabled on the bean factory, such
@ConfigurationProperties beans would not be bound.
This commit works around the limitation by adding a fallback that
performs a reflection-based search for the factory method when the
resolved factory method on the bean definition is null. This allows
the bean's factory method and any @ConfigurationProperties annotation
on it to be found, ensuring that propoerty binding is then performed.
Fixes gh-18440
2019-10-15 11:21:53 +01:00
Stephane Nicoll
4efb4d1dd3
Polish "Add some more notes on running exploded jar files"
...
See gh-18477
2019-10-15 10:02:53 +02:00
Dave Syer
3f2dd30808
Add some more notes on running exploded jar files
...
See gh-18477
2019-10-15 10:01:23 +02:00
Stephane Nicoll
391eb279df
Merge branch '2.1.x'
...
Closes gh-18588
2019-10-15 08:51:31 +02:00
Stephane Nicoll
22f44917ca
Polish "Add metadata entry for spring.main.register-shutdown-hook"
...
See gh-18581
2019-10-15 08:41:07 +02:00
leoli
9b781449cf
Add metadata entry for spring.main.register-shutdown-hook
...
See gh-18581
2019-10-15 08:37:08 +02:00
Stephane Nicoll
75bd15650f
Merge branch '2.1.x'
...
Closes gh-18587
2019-10-15 08:33:51 +02:00
Stephane Nicoll
f05d7902e2
Polish "Clarify formatting recommendations for configuration property javadoc"
...
See gh-18578
2019-10-15 08:32:48 +02:00
Rafiullah Hamedy
1f9b68707f
Clarify formatting recommendations for configuration property javadoc
...
This commit adds a note to spring-boot-features.adoc to clarify that
using javadoc tags to format configuration property descriptions is not
supported.
See gh-18578
2019-10-15 08:29:51 +02:00
Stephane Nicoll
98f676ca46
Merge branch '2.1.x'
...
Closes gh-18586
2019-10-15 08:25:25 +02:00
contextshuffling
efedd80d4b
Use LinkedHashSet for deterministic order in test assertions
...
See gh-18580
2019-10-15 08:20:53 +02:00
Stephane Nicoll
9c6e5f0904
Merge branch '2.1.x'
...
Closes gh-18585
2019-10-15 08:15:42 +02:00
dreis2211
abfb87d1a3
Rename tests to match Surefire expectations
...
See gh-18579
2019-10-15 08:11:47 +02:00
Phillip Webb
e20aa7dc73
Clarify ConfigurationPropertiesBean Javadoc
...
Update the `ConfigurationPropertiesBean` Javadoc to clarify its purpose.
Closes gh-18487
2019-10-14 20:50:42 -07:00
Andy Wilkinson
3fc51f8063
Isolate the effects of initializing Reactor's debug agent in the tests
2019-10-14 20:08:59 +01:00
Andy Wilkinson
e7efe0cbfe
Merge branch '2.1.x'
...
Closes gh-18576
2019-10-14 14:12:57 +01:00
王洋
152568521e
Make the logger static final
...
See gh-18575
2019-10-14 14:12:26 +01:00
Andy Wilkinson
65818038fe
Polish "Update Kotlin-related reference documentation"
...
See gh-18573
2019-10-14 11:41:03 +01:00
Sebastien Deleuze
c6c9818285
Update Kotlin-related reference documentation
...
See gh-18573
2019-10-14 11:40:38 +01:00
Andy Wilkinson
c75b06c76c
Remove @ImmutableConfigurationProperties
...
Closes gh-18563
2019-10-14 11:29:09 +01:00
Andy Wilkinson
cf62dc862b
Polish "Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration"
...
See gh-18571
2019-10-14 09:34:53 +01:00
dreis2211
35dc4817dd
Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration
...
See gh-18571
2019-10-14 09:34:10 +01:00
Stephane Nicoll
8108b556ad
Fix resource cleanup in test
...
Closes gh-18569
2019-10-13 13:41:50 +02:00
Stephane Nicoll
f7959bcd00
Merge branch '2.1.x'
...
Closes gh-18567
2019-10-13 08:45:44 +02:00
Ted M. Young
f553784ebc
Fix incorrect backslash escape in documentation sample
...
See gh-18546
2019-10-13 08:10:14 +02:00
dreis2211
d8de6fff53
Polish
...
See gh-18557
2019-10-12 16:55:07 +01:00
dreis2211
3174f06bf2
Remove usage of @InjectMocks
...
See gh-18557
2019-10-12 16:54:57 +01:00
Johnny Lim
887c3b71f3
Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable()
...
See gh-18559
2019-10-12 16:51:53 +01:00
Andy Wilkinson
9a89039172
Provide a marker artifact for Boot's Gradle plugin
...
Closes gh-18514
2019-10-11 16:51:29 -05:00
Stephane Nicoll
61a914fa28
Polish
2019-10-11 10:39:23 -05:00
Stephane Nicoll
40bd98a3f4
Polish "Remove boxing"
...
See gh-18552
2019-10-11 10:35:19 -05:00
clove506
fe6da39e1b
Remove boxing
...
See gh-18552
2019-10-11 10:32:59 -05:00
Johnny Lim
d60d59434d
Polish
...
See gh-18531
2019-10-11 10:29:22 -05:00
leoli
2b5f8f36a2
Fix ImmutableConfigurationProperties import statement in ref docs
...
See gh-18548
2019-10-10 07:34:46 -05:00
Andy Wilkinson
e62ca778e9
Merge branch '2.1.x'
...
Closes gh-18554
2019-10-10 07:29:57 -05:00
dreis2211
ba46ab6a4f
Remove accidental usage of UnsupportedOptionException
...
See gh-18539
2019-10-10 07:28:51 -05:00
dreis2211
09b9d18d88
Fix formatting issue
...
See gh-18544
2019-10-08 14:11:50 -05:00
dreis2211
e70a5686bf
Fix checkstyle warning
...
See gh-18541
2019-10-08 12:21:05 -05:00
Stephane Nicoll
32a1cdf4d3
Polish "Use dedicated method to turn off authentication"
...
See gh-18538
2019-10-08 11:13:51 -05:00
Michael Simons
04a01a49c2
Use dedicated method to turn off authentication
...
See gh-18538
2019-10-08 11:08:48 -05:00
Andy Wilkinson
b5243c5076
Polish "Polish"
...
See gh-18534
2019-10-08 07:38:53 -05:00
Kant Leung
2f73e196af
Polish
...
See gh-18534
2019-10-08 07:38:21 -05:00
Johnny Lim
e9e6c925e8
Remove a duplicate assertion
...
See gh-18524
2019-10-07 08:19:11 -05:00
Andy Wilkinson
002b2709d9
Document auditevent and httptrace endpoints' need for repositories
...
Closes gh-18352
2019-10-07 07:22:10 -05:00
Andy Wilkinson
8b9890eb5d
Remove Woodstox dependency management after Jackson upgrade
...
The upgrade to Jackson 2.10.0 means that the possibility of getting
an incompatible combination of Woodstox and the StAX API when
building with Maven has gone. This commit removes the dependency
management as it was only added to work around the incompatibility
in Jackson's transitive dependencies.
Closes gh-18500
2019-10-03 17:39:55 +01:00
Andy Wilkinson
078536aded
Merge branch '2.1.x'
...
Closes gh-18502
2019-10-03 15:34:32 +01:00
Andy Wilkinson
f42b442ce2
Fix handling of encoded URLs in Class-Path manifest attribute
...
Fixes gh-18410
2019-10-03 15:30:33 +01:00
Andy Wilkinson
bc8a88d734
Upgrade to Webjars Locator Core 0.41
...
Closes gh-18497
2019-10-03 08:27:51 +01:00
Andy Wilkinson
b7e434d5f8
Upgrade to Mockito 3.1.0
...
Closes gh-18496
2019-10-03 08:27:50 +01:00
Andy Wilkinson
2d08842ad7
Upgrade to Hibernate 5.4.6.Final
...
Closes gh-18495
2019-10-03 08:27:50 +01:00
