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

639 Commits

Author SHA1 Message Date
Madhura Bhave
a8a75f1bbb Merge branch '2.0.x' 2018-08-14 11:25:24 -07:00
Madhura Bhave
895d092640 PropertySourcesLoader with highest precedence should win 
Fixes gh-13955
 2018-08-14 11:23:55 -07:00
Andy Wilkinson
9032e5b470 Update SSL tests and certs for Java 11 and TLSv1.3 
See gh-14028
 2018-08-14 08:51:38 +03:00
Madhura Bhave
727e9c6b0f Merge branch '2.0.x' 2018-08-13 12:23:48 -07:00
Madhura Bhave
dfb97eb0f5 Convert environment if webApplicationType changes 
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.

Fixes gh-13977
 2018-08-13 12:12:30 -07:00
Andy Wilkinson
04215e6651 Polish 2018-08-13 15:59:48 +01:00
Stephane Nicoll
6734e11222 Adapt MultipartConfig to use DataSize support 
See gh-13974
 2018-08-13 16:43:23 +03:00
Stephane Nicoll
94013aaba6 Add support for DataSize 
This commit adds support for Spring Framework's `DataSize` allowing to
express a size in bytes and other convenient units.

Similar to the `Duration` support introduced previously, this commit
adds transparent binding support as well as detection of default values
in `@ConfigurationProperties`-annotated object.

Closes gh-13974
 2018-08-13 16:43:23 +03:00
Andy Wilkinson
da550efc6b Merge branch '2.0.x' 2018-08-10 12:50:31 +01:00
Andy Wilkinson
263e157ef0 Merge branch '1.5.x' into 2.0.x 2018-08-10 12:50:15 +01:00
Stephane Nicoll
0d04d7adf8 Migrate @EventListener to ApplicationListener 
Closes gh-14041
 2018-08-10 12:52:14 +02:00
Stephane Nicoll
817a8a8302 Polish 2018-08-10 09:48:57 +02:00
Stephane Nicoll
0ca8f1083a Fix ClassCastException message detection on Java 11 
This commit also fixes the detection of a ClassCastException that can
be safely ignored on the module path with Java 9

Closes gh-14033
 2018-08-10 09:48:22 +02:00
Stephane Nicoll
c071f34a4a Add auto-configuration support for TaskExecutor 
This commit adds support for providing a default ThreadPoolTaskExecutor
with sensible defaults. A new TaskExecutorBuilder is provided with
defaults from the `spring.task.*` namespace and can be used to create
custom instances.

If no custom `Executor` bean is present, `@EnableAsync` now uses the
auto-configure application task executor. Same goes for the async support
in Spring MVC.

Closes gh-1563
 2018-08-06 11:00:40 +02:00
Stephane Nicoll
a656513cb8 Merge branch '2.0.x' 2018-08-03 09:39:29 +02:00
Stephane Nicoll
20ea16fe9f Merge branch '1.5.x' into 2.0.x 2018-08-03 09:37:01 +02:00
Madhura Bhave
b9fcb6a5e5 Merge branch '2.0.x' 2018-08-02 15:19:35 -07:00
Madhura Bhave
16aff4cd2c Refactor PropertySourcesDeducer 
Prior to the changes that fixed #12451,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.

Fixes gh-13738
 2018-08-02 15:00:01 -07:00
Madhura Bhave
c41199bad1 Merge branch '2.0.x' 2018-08-02 11:01:47 -07:00
Madhura Bhave
7e2494ebdd Set environment active profiles according to processing order 
Fixes gh-13965
 2018-08-02 11:01:22 -07:00
Johnny Lim
02e82cd22b Remove unused dependencies 
Closes gh-13973
 2018-08-02 15:17:45 +02:00
Stephane Nicoll
960817a8c6 Merge branch '2.0.x' 2018-08-01 11:05:49 +02:00
Johnny Lim
94468e5865 Polish 
See gh-13963
 2018-08-01 11:04:59 +02:00
Stephane Nicoll
143e4f026f Merge branch '2.0.x' 2018-08-01 08:48:09 +02:00
dreis2211
66b1742f96 Optimize some StringBuilder.append() calls 
Closes gh-13961
 2018-08-01 08:41:03 +02:00
Stephane Nicoll
d12a099a6d Merge branch '2.0.x' 2018-07-31 08:17:46 +02:00
Johnny Lim
d4fba783fb Remove ex.printStackTrace() in tests 
Closes gh-13952
 2018-07-31 08:16:40 +02:00
Andy Wilkinson
d67611518f Merge branch '2.0.x' 2018-07-30 13:02:30 +01:00
Andy Wilkinson
06b4007ce4 Avoid installing unwanted ConsoleHandler when cleaning up 
Closes gh-13470
 2018-07-30 13:00:34 +01:00
Phillip Webb
4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +01:00
Phillip Webb
1b91c0ceb7 Merge branch '2.0.x' 2018-07-29 09:29:57 +01:00
Phillip Webb
0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb
80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb
aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Phillip Webb
ce9c053cbf Fix checkstyle issues on master 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:36:04 +01:00
Phillip Webb
a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb
63b609827e Fix checkstyle method order issues 
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3 Fix checkstyle javadoc issues 
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
dreis2211
2399092f16 Fix deprecation in UndertowServletWebServerFactory 
Closes gh-13873
 2018-07-25 10:19:42 +02:00
Madhura Bhave
e524adb2fc Merge branch '2.0.x' 2018-07-24 17:43:47 -07:00
Madhura Bhave
1831f3be16 Fix NPE when Collection contains unbound children 
Fixes gh-13636
 2018-07-24 17:42:51 -07:00
Brian Clozel
57dbea0db3 Finalize upgrade to Reactor Netty 0.8 
This commit fixes the last issue for the upgrade to Reactor Netty 0.8.

Closes: gh-13321
 2018-07-24 14:56:23 +02:00
Brian Clozel
e15ca514c8 Update HttpResources cleaning for Reactor Netty 
This commit updates the workaround for issue gh-9146
 2018-07-24 14:07:57 +02:00
Brian Clozel
dd79143d1a Support http/2 configuration with Reactor-Netty 
Just like Jetty, Reactor Netty supports ALPN with JDK8 or with a
dependency that delegates TLS to a native library using boringSSL.

Closes gh-13333
 2018-07-24 14:07:57 +02:00
Stephane Nicoll
ccabf83815 Merge branch '2.0.x' 2018-07-23 09:31:54 +02:00
Stephane Nicoll
dcb68d4c64 Deprecate unused property 
Closes gh-13836
 2018-07-23 09:31:02 +02:00
Stephane Nicoll
0f0fc9ec62 Adapt assertion to logging change in Spring Framework 2018-07-20 17:12:56 +02:00
Madhura Bhave
6333edbe16 Merge branch '2.0.x' 2018-07-18 11:01:38 -07:00
Madhura Bhave
66156cc24f Polish 2018-07-18 10:29:43 -07:00