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
Spring Operator
991ba550d3
Update build and setup configuration to use HTTPS
...
See gh-16245
2019-03-19 16:48:30 +00:00
Spring Operator
e2837843e1
Update build and setup configuration to use HTTPS
...
See gh-16244
2019-03-19 16:44:10 +00:00
Spring Buildmaster
b04710d744
Next development version
2019-01-11 15:59:00 +00:00
Spring Buildmaster
9bb64a3493
Next Development Version
2018-11-29 09:52:39 +00:00
Spring Buildmaster
4d24feb443
Next development version
2018-10-16 08:44:44 +00:00
Spring Buildmaster
46df506b0a
Next development version
2018-09-11 14:24:40 +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
Spring Buildmaster
73bf744cb0
Next Development Version
2018-07-30 13:37:38 +00:00
Spring Buildmaster
36b8639853
Next Development Version
2018-06-14 10:05:31 +00:00
Spring Buildmaster
010b4fccbd
Next development version
2018-05-09 09:31:46 +00: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
Spring Buildmaster
c10aad165f
Next Development Version
2018-04-09 23:14:33 +00:00
Spring Buildmaster
ade4760842
Next Development Version
2018-04-05 09:01:52 +00: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
Spring Buildmaster
6414b42335
Next Development Version
2018-01-30 23:29:33 +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
Spring Buildmaster
df2ae7aa19
Next Development Version
2017-11-28 09:55:46 +00:00
Spring Buildmaster
c0f9f64776
Next Development Version
2017-10-16 12:36:43 +00: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
Spring Buildmaster
30eb937a83
Next Development Version
2017-09-12 10:54:22 +00: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
Spring Buildmaster
17a5bb0be4
Next development version
2017-07-27 08:00:21 +00:00
Spring Buildmaster
41c5c0e7c9
Next development version
2017-07-26 08:30:55 +00: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
Spring Buildmaster
05d4d0281c
Next Development Version
2017-06-08 12:47:16 +00:00
Spring Buildmaster
88e43c8421
Next Development Version
2017-06-08 09:52:43 +00: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
Spring Buildmaster
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
