175 Commits

Author SHA1 Message Date
Phillip Webb
f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb
47c6bf741d Merge branch '2.0.x' into 2.1.x 2019-04-02 13:40:21 -07:00
Phillip Webb
07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Stephane Nicoll
090f5f5397 Polish "Add error rendering support with @WebFluxTest"
Closes gh-16266
2019-03-29 11:36:27 +01:00
Ali Dehghani
53e7484d87 Add error rendering support with @WebFluxTest
See gh-16266
2019-03-29 11:07:26 +01:00
Andy Wilkinson
864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson
ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Madhura Bhave
0a54fb73fa Remove redundant include from WebFluxTypeExcludeFilter
For webflux, security configuration is configured via a bean of type
`SecurityWebFilterChain` and not `ServerHttpSecurity`. We would have changed
the include to be `SecurityWebFilterChain` but the filter only applies to
beans registered via component scanning and not those registered in
`@Configuration` classes, making the includes redundant.

See gh-16088
2019-03-20 17:54:04 -07:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Stephane Nicoll
161c0b9fad Polish contribution
Closes gh-16170
2019-03-12 11:06:19 +01:00
ayudovin
51013421f2 Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
See gh-16170
2019-03-12 11:06:18 +01:00
Stephane Nicoll
078bd890a6 Merge branch '2.0.x' into 2.1.x 2019-03-12 11:05:23 +01:00
Stephane Nicoll
50d0b4df46 Polish 2019-03-12 11:04:00 +01:00
Andy Wilkinson
8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson
7153525ee2 Annotation @JsonTest with @ExtendWith(SpringExtension.class)
Closes gh-16183
2019-03-09 20:00:06 +00:00
Johnny Lim
3242e89271 Polish
See gh-16083
2019-03-04 15:18:51 +01:00
Stephane Nicoll
2099093978 Merge branch '2.0.x' into 2.1.x 2019-03-04 15:00:00 +01:00
Stephane Nicoll
b8cbd0c17f Merge branch '1.5.x' into 2.0.x 2019-03-04 14:55:10 +01:00
dreis2211
be445f6346 Use AssertJ facilities for expected exceptions
See gh-16066
2019-03-04 08:45:42 +01:00
Andy Wilkinson
9fb0b97f96 Decorate test containers so tests are skipped without Docker
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Andy Wilkinson
2884d99a5d Complete move to Testcontainers' Neo4j container
Closes gh-15638
2019-02-12 09:46:11 +00:00
Andy Wilkinson
01b8e2c834 Polish “Replace custom Neo4j container with Testcontainers version”
See gh-15638
2019-02-12 09:25:07 +00:00
Michael Simons
316126e8f0 Replace custom Neo4j container with Testcontainers version
See gh-15638
2019-02-12 09:24:44 +00:00
Andy Wilkinson
3f32fbd0de Polish "Remove unwanted @Nullable annotations"
See gh-15876
2019-02-11 16:11:40 +00:00
wonwoo
2855321074 Remove unwanted @Nullable annotations
See gh-15876
2019-02-11 16:07:29 +00:00
Andy Wilkinson
82bc87560c Use AssertJ’s exception assertions rather than fail
Closes gh-15761
2019-02-04 11:48:26 +00:00
Stephane Nicoll
485bdc9901 Polish "Remove redundant interface modifiers"
Closes gh-15694
2019-01-14 08:13:08 -05:00
igor-suhorukov
2d873c78fe Remove redundant interface modifiers
See gh-15694
2019-01-14 08:12:41 -05: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
dreis2211
948902f090 Avoid unnecessary usage of ReflectionTestUtils
Closes gh-15482
2018-12-17 17:07:23 +01:00
Phillip Webb
ba1ef52e39 Merge branch '2.0.x' 2018-11-29 15:32:48 -08:00
Phillip Webb
893d5666be Update copyright year for changed files 2018-11-29 15:30:51 -08:00
Andy Wilkinson
6729e56f6b Merge branch '2.0.x' 2018-11-27 12:00:36 +00:00
Andy Wilkinson
e74b084c67 Auto-configure codec customizations and JSON when using @WebFluxTest
Closes gh-15070
2018-11-27 11:48:30 +00:00
Phillip Webb
cccf5e6d2b Merge branch '2.0.x' 2018-11-14 18:27:28 -08:00
Phillip Webb
3baf782822 Merge branch '1.5.x' into 2.0.x 2018-11-14 18:24:32 -08:00
dreis2211
3b4b0641d9 Polish some Map operations
Closes gh-15153
2018-11-12 09:08:25 +01:00
Phillip Webb
f3fa20b2d1 Polish 2018-10-29 14:25:45 -07:00
Stephane Nicoll
474da80b4d Revert "Restructure of security packages"
See gh-14412
2018-10-17 12:22:51 +02:00
Stephane Nicoll
39f8b685df Merge branch '2.0.x' 2018-10-16 11:38:39 +02:00
Johnny Lim
47daf96c48 Polish
See gh-14843
2018-10-16 11:37:02 +02:00
Phillip Webb
29707bf75a Complete restructure of security packages
Complete the restructuring of the security auto-configuration
packages by removing the direct import of web configuration from
the main security auto-configuration.

Closes gh-14412
2018-10-16 01:01:11 -07:00
Madhura Bhave
f835f82582 Preliminary restructure of security packages
Restructure the security auto-configuration packages to better reflect
the part of the system that the configuration applies to.

See gh-14412
2018-10-16 01:01:10 -07:00
Phillip Webb
5c7a4523ea Merge '2.0.x' 2018-10-05 13:34:12 -07:00
Phillip Webb
6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Phillip Webb
d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00