Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,816 Commits 23 Branches 0 Tags
23e2bd4bc9dd00ab2edcc3100d1b8fa311c36f07
Commit Graph

222 Commits

Author SHA1 Message Date
Phillip Webb
ff36074401 Update copyright header for changed files 
Effectively all files have been touched this year due to the nohttp
work.
 2019-07-24 11:37:23 +01:00
Phillip Webb
8843c11a28 Update copyright header of changed files 2019-07-17 21:44:01 +01:00
Phillip Webb
d91f27e11f Fix Javadoc @Since checkstle violations 
Apply consistent `@Since` tags and retrofit the existing code using a
best guess from the git history.

Closes gh-17360
 2019-06-28 22:41:15 -07:00
Andy Wilkinson
8f1be4cded Upgrade to spring-javaformat 0.0.11 2019-06-07 09:44:58 +01:00
Phillip Webb
d548c5ed31 Fix checkstyle violations 2019-06-04 12:45:23 -07:00
Phillip Webb
2ff74b1559 Reformat code with spring-javaformat 0.0.8 
See gh-16418
 2019-04-02 13:30:25 -07:00
Andy Wilkinson
94633cfd89 Merge branch '1.4.x' into 1.5.x 2019-03-27 14:04:32 +00:00
Spring Operator
189eeefbb1 Use HTTPS for external links wherever possible 
See gh-16317
 2019-03-27 12:30:55 +00:00
Andy Wilkinson
79c53de30c Merge branch '1.4.x' into 1.5.x 2019-03-26 13:44:03 +00:00
Spring Operator
4e2739eceb Use HTTPS for external links from XML files where possible 
See gh-16312
 2019-03-26 13:43:05 +00:00
Andy Wilkinson
46d6fb0e1c Merge branch '1.3.x' into 1.4.x 2019-03-26 13:40:26 +00:00
Andy Wilkinson
4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Phillip Webb
a9e8116a99 Only check for Mockito once 
Update `MockReset` so that checking for Mockito only happens once.

Closes gh-14260
 2018-09-05 13:25:18 -07:00
Phillip Webb
9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07:00
Phillip Webb
99dad81e9a Update copyright header year for changed files 2018-05-04 12:15:13 -07:00
Phillip Webb
0a0247975c Formatting 2018-05-04 12:00:50 -07:00
Phillip Webb
4e96587dc8 Polish modifier declaration ordering 
Follow that Java language specification.
 2018-05-03 09:46:15 -07:00
Phillip Webb
3ee777e142 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 09:46:15 -07:00
Andy Wilkinson
06cf698387 Polish 2018-05-02 12:12:47 +01:00
Phillip Webb
a8f366a554 Fix copyright header for edited files 2018-03-16 15:07:23 -07:00
Phillip Webb
798522d890 Format with Eclipse Oxygen SR2 2018-02-08 15:46:49 -08:00
Andy Wilkinson
debe15b284 Polish 2018-02-05 19:16:45 +00:00
Andy Wilkinson
aac88502c8 Reinject mocks when context is dirtied before each method 
Closes gh-11903
 2018-02-05 10:53:34 +00:00
Phillip Webb
8e783cdae9 Polish 2018-01-18 21:42:11 -08:00
Johnny Lim
97a51ddcaa Use the platform-specific line separator 
See gh-11674
 2018-01-18 17:00:18 +01:00
Phillip Webb
2c429ba77d Restore static final formatting 
Restore static final constants to upper case formatting.

See gh-10457
 2017-12-13 12:21:57 -08:00
Phillip Webb
6a55623910 Polish 2017-12-13 12:21:57 -08:00
Johnny Lim
bfa291f671 Polish 2017-10-02 15:07:03 +01:00
Andy Wilkinson
663cae1255 Note behaviour of @MockBean and @SpyBean with non-bean dependencies 
Closes gh-10381
 2017-09-29 15:51:56 +01:00
Andy Wilkinson
7a4c18eaba Polish "Deprecate JsonContent.assertThat()" 
Closes gh-9678
 2017-07-27 10:50:09 +01:00
Priyanshi
fa57491030 Deprecate JsonContent.assertThat() 
See gh-9678
 2017-07-27 10:49:55 +01:00
Andy Wilkinson
ece66e1d4a Polish javadoc in JsonContentAssert 
See gh-9675
 2017-07-21 15:30:09 +01:00
Andy Wilkinson
f6727e786a Polish "Fix JsonContentAssert type safety warnings" 
- Format code
- Update an existing test to use the contains method that would
  previously have triggered a type safety warning

Closes gh-9675
 2017-07-21 15:14:53 +01:00
Mihhail Lapushkin
ae91c8460f Fix JsonContentAssert type safety warnings 
Previously, JsonContentAssert returns AbstractMapAssert from
extractingJsonPathMapValue. This could lead to type safety warnings
when calling one of the assert's methods with a generic varargs
parameter such as
contains(Entry<? extends Object, ? extends Object>...).

This commit replaces the use of both AbstractMapAssert and
AbstractListAssert with MapAssert and ListAssert respectively. These
classes use final methods and @SafeVargs args to prevent the
above-described problem from occurring.

See gh-9675
 2017-07-21 15:10:57 +01:00
Andy Wilkinson
84721666c5 Stop DuplicateJsonObjectContextCustomizer breaking context caching 
See gh-9248
 2017-06-06 22:23:43 +01:00
Andy Wilkinson
21a5ab7875 Log a warning during tests when multiple JSONOjects on the class path 
Closes gh-9248
 2017-06-06 21:35:33 +01:00
Stephane Nicoll
b5709fd618 Polish 
See gh-9330
 2017-05-28 17:44:58 +02:00
Stephane Nicoll
a22b3d9515 Merge branch '1.4.x' into 1.5.x 2017-05-12 17:27:28 +02:00
Stevo Slavić
6e1d99aa10 Fix typo in javadoc 
Closes gh-9212
 2017-05-12 17:26:26 +02:00
Phillip Webb
931ce15d7f Update copyright header dates 2017-05-09 21:43:52 -07:00
Phillip Webb
5abc050a96 Support detection and with test initializers 
Relax `SpringBootTestContextBootstrapper` rules so that a test can
specify an `ApplicationContextInitializer` and still have
`@SpringBootConfiguration` detected.

Prior to this commit detection would not occur because it's possible
that an initializer _could_ register configuration. This scenario is
actually quite unlikely to occur, certainly less likely than wanting to
use an initializer in combination with auto-detection.

Fixes gh-8483
 2017-04-19 22:18:12 -07:00
Phillip Webb
393c17b68b Support @SpringBootTest with @ContextHierarchy 
Update SpringBootTestContextBootstrapper to detect `@ContextHierarchy`
annotations so that only the last child creates a
`WebApplicationContext`.

Prior to this commit a context hierarchy would start two embedded web
servers which is inconsistent with the `SpringApplicationBuilder`
behavior.

Fixes gh-8311
 2017-04-18 14:56:12 -07:00
Phillip Webb
8eb79b3c0f Polish 2017-04-18 11:13:12 -07:00
Phillip Webb
f46d799f31 Polish 2017-04-17 22:08:51 -07:00
Madhura Bhave
9e2d54feae Support json view with JacksonTester 
Closes gh-8672
 2017-04-17 11:14:26 -07:00
Stephane Nicoll
c8ac94b75d Polish contribution 
Closes gh-8490
 2017-03-10 09:51:35 +01:00
Roland Weisleder
a6f0da8cc6 Introduce reset method to OutputCapture 
Closes gh-8390
 2017-03-10 09:48:36 +01:00
Andy Wilkinson
545b29552d Merge branch '1.4.x' into 1.5.x 2017-02-28 15:58:08 +00:00
Andy Wilkinson
98cf35d48e Polish "Ignore spock.lang annotations when creating test context cache key" 
See gh-8252
 2017-02-28 15:55:55 +00:00