fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,947 Commits 22 Branches 339 Tags
Commit Graph

1248 Commits

Author SHA1 Message Date
Andy Wilkinson
4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Madhura Bhave
5bd2b349bc Merge branch '2.1.x' 2019-03-25 16:04:22 -07:00
Madhura Bhave
91c1fc3d97 Ignore unbound collection properties if collection bound 
As of Spring Boot 2.0, if Collection properties are specified in
multiple property sources, only the elements from the property source
with the highest precedence are used for binding. This caused an
`UnboundConfigurationPropertiesException` if the size of the collection
from the higher order property source was smaller and `ignoreUnknownFields`
was set to true.

This commit ignores unbound collection properties if the
collection was properly bound.

Fixes gh-16290
 2019-03-25 16:03:33 -07:00
Stephane Nicoll
197e1669e2 Polish 2019-03-25 09:01:13 +01:00
Madhura Bhave
8f693a0277 Add support for configuration properties scanning 
See gh-12602
 2019-03-21 13:30:44 -07:00
Andy Wilkinson
41967fc629 Correct the URI used for the properties DTD 
See gh-16270
 2019-03-20 17:48:33 +00:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c Use HTTPS for external links in XML files 
See gh-16270
 2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS 
See gh-16246
 2019-03-19 16:58:31 +00:00
Stephane Nicoll
09ad80b3d9 Merge branch '2.1.x' 2019-03-16 08:27:45 +01:00
Stephane Nicoll
372802a203 Polish "Order the search locations in javadoc by precedence order" 
Closes gh-16099
 2019-03-16 08:23:57 +01:00
Muhammad Hewedy
4bac6c6688 Order the search locations in javadoc by precedence order 
See gh-16099
 2019-03-16 08:23:01 +01:00
Stephane Nicoll
d625025051 Polish "Add default no-op method to SpringApplicationRunListener" 
Closes gh-16104
 2019-03-16 08:05:52 +01:00
ayudovin
997f07d13f Add default no-op method to SpringApplicationRunListener 
See gh-16104
 2019-03-16 08:05:32 +01:00
Madhura Bhave
3d0219c315 Merge branch '2.1.x' 2019-03-15 18:09:47 -07:00
Johnny Lim
c5b5f752ed Polish 
Closes gh-16219
 2019-03-15 17:54:48 -07:00
Stephane Nicoll
adaa49c0df Polish 
See gh-8762
 2019-03-15 12:16:05 +01:00
Stephane Nicoll
de21d71e20 Remove support of @Autowired for configuration properties bean 
See gh-8762
 2019-03-14 11:16:22 +01:00
Andy Wilkinson
0872eb0dd9 Remove use of ReflectionUtils.doWithMethods from ConfigurationBeanFactoryMetadata 
Closes gh-16220
 2019-03-13 18:34:45 +00:00
Stephane Nicoll
9da20b7e52 Merge branch '2.1.x' 2019-03-13 17:51:38 +01:00
Ruslan Stelmachenko
fcde648c50 Fix typo in logging.group property description 
Closes gh-16224
 2019-03-13 17:47:51 +01:00
Andy Wilkinson
ae3ea186e2 Align test with change to exception in latest Framework snapshots 2019-03-13 14:22:40 +00:00
Brian Clozel
8866a25ef7 Polish Undertow tests 2019-03-13 11:55:53 +01:00
Andy Wilkinson
68bfb020aa Reduce need for bean method proxying and disable where not needed 
Closes gh-9068
 2019-03-12 13:18:42 +00:00
Stephane Nicoll
8ff0a9c5a9 Merge branch '2.1.x' 2019-03-12 10:51:08 +01:00
Johnny Lim
bcfbabe6cd Polish 
Closes gh-16193
 2019-03-12 10:50:32 +01:00
Andy Wilkinson
4b98fa7d94 Alias proxyBeanMethods on annotations meta-annotated with @Configuration 
Closes gh-16201
 2019-03-12 09:24:20 +00:00
Phillip Webb
64a2e8d67f Update copyright year for changed files 2019-03-11 22:15:36 -07:00
Phillip Webb
dd3e8154d9 Merge branch '2.1.x' 2019-03-11 22:15:19 -07:00
Phillip Webb
fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Madhura Bhave
d92c2f7023 DefaultProperties profiles shouldn't take precedence over config files 
Fixes gh-15445
 2019-03-11 16:17:46 -07:00
Andy Wilkinson
aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Stephane Nicoll
09d51089ba Polish 2019-03-11 17:24:52 +01:00
Stephane Nicoll
fd0a11b7a7 Reuse Kotlin parameter names if possible 
This commit detects a Kotlin constructor so that it is not required to
transmit the parameter names information to the Java side.

See gh-8762
 2019-03-11 17:23:45 +01:00
Andy Wilkinson
8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson
361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Stephane Nicoll
341859b5fe Start building against Spring Framework 5.2 snapshots 
See gh-16173
 2019-03-11 15:22:14 +01:00
Stephane Nicoll
c30f9815c1 Fix detection of Autowired constructor with Kotlin 
Previously, the import selector wrongly assumed that we should not
use constructor injection with Kotlin. Rather than looking up for the
primary constructor, we retrieve available constructors on the Java
counter-part.

This commit applies the same logic as in the constructor parameter
binder and checks for the primary constructor for Kotlin types.

See gh-8762
 2019-03-11 10:19:25 +01:00
Andy Wilkinson
7d0317419d Polish 2019-03-10 12:42:09 +00:00
Stephane Nicoll
d07a6ff0bb Fix binding of bean with no bean definition 
See gh-16180
 2019-03-09 20:49:47 +01:00
Stephane Nicoll
430571b37b Perform binding at creation time if possible 
Previously, environment binding always happened in a post processor once
the bean has been created. Constructor binding requires to perform the
binding at creating time so this commit performs binding at creation
time if possible.

When this happens, a special `ConfigurationPropertiesBeanDefinition` is
created with a supplier that invokes the binder. To avoid a case where
a bean is processed twice, the post-processor now ignores any bean that
has already been bound to the environment.

Closes gh-8762

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
 2019-03-08 15:50:44 +01:00
Madhura Bhave
7ca589d43c Add constructor based binding support 
See gh-8762

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
 2019-03-08 15:50:44 +01:00
Andy Wilkinson
b8dff5fe17 Merge branch '2.1.x' 2019-03-07 10:20:29 +00:00
Andy Wilkinson
c4756e9057 Merge branch '2.1.x' 2019-03-07 09:43:16 +00:00
Andy Wilkinson
f46894dfd3 Merge branch '2.0.x' into 2.1.x 2019-03-07 09:43:02 +00:00