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

179 Commits

Author SHA1 Message Date
Johnny Lim
521f746151 Polish 
Closes gh-14517
 2018-09-20 09:51:10 +02:00
Madhura Bhave
b2dd162572 Merge branch '2.0.x' 2018-09-17 14:30:38 -07:00
Madhura Bhave
d7d5cbf959 Simplify printing ConditionEvaluationReport when using context runner 
Closes gh-13119
 2018-09-17 14:23:47 -07:00
Madhura Bhave
d5a197fe66 Support random actuator port in SpringBootTest 
This commit changes @SpringBootTest(randomPort = true) to
generate a random port for the actuator endpoints if the
management server runs on a different port from the main
server.

Closes gh-4424
 2018-09-14 15:42:08 -07:00
Phillip Webb
04710373bf Add @Author attribution 
See gh-11077
 2018-09-06 13:42:29 -07:00
Phillip Webb
bc357225b5 Polish MockitoPostProcessor 
Closes gh-11077
 2018-09-06 13:31:35 -07:00
Andreas Neiser
a5b3a2646b Test @MockBean/@SpyBean with @Primary 
Add additional tests to ensure that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.

See gh-11077
 2018-09-06 13:31:33 -07:00
Phillip Webb
c777614d8f Support @MockBean/@SpyBean with @Primary 
Update `MockitoPostProcessor` so that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.

See gh-11077

Co-authored-by: Andreas Neiser <andreas.neiser@gmail.com>
 2018-09-06 13:24:41 -07:00
Phillip Webb
82b27c60a4 Drop MockitoPostProcessor factory method 
Remove factory method previously used to create the mock instance.
Since commit 0e00a49dcc, the method is not longer needed.

See gh-11077
 2018-09-06 13:22:46 -07:00
Phillip Webb
0e725543d5 Merge branch '2.0.x' 2018-09-05 13:43:16 -07:00
Phillip Webb
ec27137632 Merge branch '1.5.x' into 2.0.x 2018-09-05 13:40:48 -07:00
Johnny Lim
d92441e53f Update assertion message in AnnotatedClassFinder.scanPackage() 
Closes gh-13989
 2018-08-03 09:06:38 +02:00
Phillip Webb
4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +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
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
Stephane Nicoll
f780179777 Polish contribution 
Closes gh-13904
 2018-07-26 17:22:58 +02:00
artsiom
df6feb3e2a Make SpringBootConfigurationFinder public and usable with other annotations 
See gh-13904
 2018-07-26 17:07:55 +02:00
Andy Wilkinson
6a48a440b2 Annotate our test annotations with @ExtendWith(SpringExtension.class) 
Closes gh-13739
 2018-07-11 17:25:21 +01:00
Andy Wilkinson
b4cd4f4c43 Stop mocking class that is final in latest Framework 5.1 snapshots 2018-06-28 10:51:58 +01:00
Andy Wilkinson
20546024d3 Merge branch '2.0.x' 2018-06-20 10:11:44 +01:00
Andy Wilkinson
e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available 
Closes gh-13521
 2018-06-20 10:10:35 +01:00
Andy Wilkinson
e306aad28c Merge branch '2.0.x' 2018-06-01 17:27:10 +01:00
Andy Wilkinson
27267a7090 Ensure that condition evaluator uses runner’s class loader 
Closes gh-13319
 2018-06-01 17:26:32 +01:00
Stephane Nicoll
52b80c77d8 Merge branch '2.0.x' 2018-05-29 10:39:39 +02:00
nkjackzhang
17bcd1c359 Fix wrong reference in cast operation 
Closes gh-13288
 2018-05-29 10:37:32 +02:00
Stephane Nicoll
7462401291 Merge branch '2.0.x' 2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b Fix javadoc 
Closes gh-13274
 2018-05-28 09:26:16 +02:00
Stephane Nicoll
4464a5f5bd Remove code deprecated in 2.0 
Closes gh-12962
 2018-05-22 14:48:25 +02:00
Phillip Webb
2dc4f1df00 Polish 2018-05-21 21:32:42 -07:00
Stephane Nicoll
300f6bf4d7 Polish contribution 
Closes gh-13208
 2018-05-18 14:20:31 +02:00
Mihhail Lapushkin
d31dbac69e Support custom UriTemplateHandler in LocalHostUriTemplateHandler 
See gh-13208
 2018-05-18 14:19:01 +02:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Phillip Webb
2d70a7ae5e Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 22:43:12 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Johnny Lim
f03849d502 Polish 
See gh-12812
 2018-04-10 11:46:16 +02:00
igor-suhorukov
4c61d8abfe avoid check class by string name 2018-03-14 23:59:42 +01:00
Stephane Nicoll
ed05e1f7ca Polish "Reorder modifiers to comply with the JLS" 
Closes gh-12432
 2018-03-12 15:17:23 +01:00
igor-suhorukov
aebb475bc5 Reorder modifiers to comply with the JLS 
See gh-12432
 2018-03-12 15:17:05 +01:00
igor-suhorukov
98f4692c62 Polish 
This commit changes invocations to immediately return the expression
instead of assigning it to a temporary variable. The method name should
be sufficient for callers to know exactly what will be returned.

Closes gh-12211
 2018-02-25 10:59:02 +01:00
Phillip Webb
4b9c3c137e Polish Collection.toArray 
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
 2018-02-22 21:11:30 -08:00
Johnny Lim
680287635c Rename TestRestTemplateTestContextCustomizer* 
Closes gh-12182
 2018-02-22 20:26:14 -08:00
Phillip Webb
cd5266ac03 Polish 2018-02-22 20:25:28 -08:00
Johnny Lim
2fe86da95b Use isTrue() and isFalse() for AssertJ 
Closes gh-12170
 2018-02-22 09:55:40 +01:00
igor-suhorukov
fe023817c7 Polish static finals 
Closes gh-12083
 2018-02-19 20:10:58 -08:00