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

1029 Commits

Author SHA1 Message Date
Madhura Bhave
862ffcbbf4 Merge branch '2.1.x' 2019-02-13 13:33:14 -08:00
Madhura Bhave
bbe555a4f5 Split Jersey management context configuration 
This commit splits the management context configuration for jersey
into two separate configurations depending on if the type is SAME or
CHILD. The configuration for the SAME context should only kick in if
there is no existing ResourceConfig bean.

Fixes gh-15891
 2019-02-13 13:27:54 -08:00
Andy Wilkinson
22192c2b5c Polish "Make auto-config of RestTemplate metrics back off with no builder bean" 
Closes gh-15842
 2019-02-12 14:35:38 +00:00
Raheela
8f3c4dbc64 Make auto-config of RestTemplate metrics back off with no builder bean 
See gh-15842
 2019-02-12 14:28:48 +00:00
Madhura Bhave
4d69e127c8 Merge branch '2.1.x' 2019-02-08 18:38:21 -08:00
Madhura Bhave
26da45aa9a Configure a JerseyApplicationPath bean for the actuators 
This commit also ensures that Jersey-based actuator endpoints are
available before the user has configured a `ResourceConfig` bean

Fixes gh-15625
Fixes gh-15877
 2019-02-08 18:38:01 -08:00
Stephane Nicoll
380d7ec01c Merge branch '2.1.x' 2019-02-08 09:21:06 +01:00
Johnny Lim
885c28891b Polish 
Closes gh-15873
 2019-02-08 09:20:15 +01:00
Andy Wilkinson
ecb7e240eb Merge branch '2.1.x' 2019-02-05 12:33:19 +00:00
Andy Wilkinson
59c66eaf41 Correct documented path for locked synchronizer's identity hashcode 
Closes gh-15847
 2019-02-05 12:30:46 +00:00
Andy Wilkinson
ebcc53a9b7 Include tasks with custom triggers in scheduledtasks endpoint output 
Closes gh-15815
 2019-02-05 12:12:07 +00:00
Stephane Nicoll
002fa405a8 Merge branch '2.1.x' 2019-01-31 16:26:37 +01:00
Stephane Nicoll
ede23caace Polish "Inject Map directly rather than via ObjectProvider" 
Closes gh-15798
 2019-01-31 16:25:18 +01:00
ayudovin
3a2e85ce75 Inject Map directly rather than via ObjectProvider 
See gh-15798
 2019-01-31 16:24:18 +01:00
Andy Wilkinson
f23a0a5969 Inject InfoContributorProperties more precisely 
Closes gh-15750
 2019-01-21 16:56:39 +00:00
Stephane Nicoll
6baa6b291e Polish contribution 
Closes gh-15695
 2019-01-14 08:11:20 -05:00
Johnny Lim
af3ed9ff9f Polish 
See gh-15695
 2019-01-14 08:09:32 -05:00
Phillip Webb
2f77ef7722 Merge branch '2.1.x' 2019-01-11 16:45:05 -08:00
Phillip Webb
9e58942698 Update copyright year for changed files 2019-01-11 16:42:02 -08:00
Phillip Webb
6a901199f5 Polish 2019-01-11 16:42:02 -08:00
Stephane Nicoll
5e736c0d1f Merge branch '2.1.x' 2019-01-07 13:46:23 +01:00
Stephane Nicoll
6ad01a6dfc Optimize ConditionalOnEnabledEndpoint usage 
Closes gh-15451
 2019-01-07 13:45:53 +01:00
Stephane Nicoll
2d2aa96c05 Allow ConditionalOnEnabledEndpoint to be set at class level 
See gh-15451
 2019-01-07 13:45:35 +01:00
Madhura Bhave
2dc7a89bd4 Merge branch '2.1.x' 2019-01-02 14:00:10 -08:00
Madhura Bhave
5b990605dc Polish "Order actuator security config after resource-server config" 
Closes gh-15472
 2019-01-02 13:57:49 -08:00
Stephen Doxsee
4597e7cc82 Order actuator security config after resource-server config 
See gh-15472
 2019-01-02 13:57:40 -08:00
Stephane Nicoll
d57f831f50 Polish "Use Optional value in more functional style" 
Closes gh-15575
 2018-12-29 11:26:56 +01:00
igor-suhorukov
8ced867e95 Use Optional value in more functional style 
See gh-15575
 2018-12-29 11:26:27 +01:00
Stephane Nicoll
fd12e696b0 Polish "Replace redundant call to class isInstance() with instanceof" 
Closes gh-15554
 2018-12-23 15:51:39 +01:00
igor-suhorukov
7424f48803 Replace redundant call to class isInstance() with instanceof 
See gh-15554
 2018-12-23 15:50:22 +01:00
Stephane Nicoll
9d67400afa Merge branch '2.1.x' 2018-12-20 17:54:08 +01:00
igor-suhorukov
e578d30722 Replace anonymous inner class with lambda 
See gh-15438
 2018-12-20 17:47:29 +01:00
Andy Wilkinson
3a7406fe3a Merge branch '2.0.x' into 2.1.x 2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:31:39 +00:00
Andy Wilkinson
9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:24:53 +00:00
Andy Wilkinson
de599819ae Merge branch '2.1.x' 2018-12-19 16:57:19 +00:00
Andy Wilkinson
33fb1fa9a3 Avoid creating meter binders before registry has been customized 
Previously, MeterRegistryPostProcessor would trigger the creation of all
meter binders and meter registry customizers before applying the
customizers and calling the binders. In some situations with complex
dependency graphs where the creation of a binder and the injection of
its dependencies inadvertently triggered some meter binding, this
could result in meters being bound before the registry had been
customized.

This commit reworks MeterRegistryPostProcessor and MeterRegistryConfigurer
to defer the retrieval of registry customizers and meter binders until
just before they are needed. As a result, customizers are now retrieved
and applied before the binders are retrieved.

Closes gh-15483
 2018-12-19 16:47:30 +00:00
Andy Wilkinson
064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved 
See gh-14736
See gh-14737
See gh-14738
 2018-12-12 16:49:30 +00:00
Andy Wilkinson
2b453bbb16 Minimise dependencies on Log4j2 
Closes gh-15441
 2018-12-12 08:19:34 +00:00
Andy Wilkinson
71b29684b3 Remove redundant field type configuration 
See gh-15435
 2018-12-11 08:30:24 +00:00
Andy Wilkinson
55d7c19c06 Merge branch '2.1.x' 2018-12-10 17:59:50 +00:00
Andy Wilkinson
d05ae40c99 Remove redundant field type and optional configuration 
See gh-15435
 2018-12-10 17:59:26 +00:00
Andy Wilkinson
393decff35 Merge branch '2.1.x' 2018-12-10 17:58:00 +00:00
Andy Wilkinson
ef4ea591b3 Mark nested optional fields as optional 
See gh-15435
 2018-12-10 17:49:41 +00:00
igor-suhorukov
2b1653d009 Simplify code by using try-with-resources statement 
Closes gh-15427
 2018-12-10 09:05:33 +01:00
igor-suhorukov
5c1813aef8 Replace this lambda with a method reference 
See gh-15401
 2018-12-07 11:01:42 +01:00
Madhura Bhave
59d2b0a3fb Upgrade tests to Junit5 
See gh-14737
 2018-12-05 17:49:09 -08:00
Andy Wilkinson
5c986b5030 Merge branch '2.1.x' 2018-12-03 16:29:36 +00:00