133 Commits

Author SHA1 Message Date
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
Johnny Lim
b079eeff1a Polish
Closes gh-14621
2018-10-01 10:51:13 -04:00
Stephane Nicoll
2d36a6f952 Merge branch '2.0.x' 2018-10-01 10:50:58 -04:00
Johnny Lim
1eca492c5e Polish
See gh-14621
2018-10-01 10:46:27 -04:00
Andy Wilkinson
726579a910 Merge branch '2.0.x' 2018-10-01 14:01:38 +01:00
Andy Wilkinson
89f5cfc5a4 Merge branch '1.5.x' into 2.0.x 2018-10-01 13:51:55 +01:00
Andy Wilkinson
4b00dc8a5c Add support for Spring Data JDBC (auto-config, starter, and test slice)
Closes gh-14489
2018-09-21 14:18:52 +01:00
Andy Wilkinson
cc6cf880cf Stop using ObjectProvider<List> and ObjectProvider<Collection>
Closes gh-14467
2018-09-20 13:19:40 +01:00
Johnny Lim
521f746151 Polish
Closes gh-14517
2018-09-20 09:51:10 +02:00
Johnny Lim
fd97f07209 Use meaningful name for MockServerConfigurer bean
Closes gh-14512
2018-09-19 15:31:38 +02:00
Phillip Webb
84b6fff8c0 Update copyright year for changed files 2018-09-11 14:28:28 -07:00
Phillip Webb
57ec09a55f Polish 2018-09-11 14:27:10 -07:00
Madhura Bhave
ab6bdc7ae2 Apply springSecurity configurer to WebTestClient
Also, @WebFluxTest now adds any ServerHttpSecurity beans
to the context.

Closes gh-13632
2018-09-11 13:28:13 -07:00
Phillip Webb
424dfc398b Move 'insights.web' properties to 'spring.http'
Relocate the 'spring.insights.web.log-request-details' property to
'spring.http.log-request-details'.

Closes gh-14313
2018-09-11 12:51:14 -07:00
LEVI PAUL
74891a75bb Include TaskExecutionAutoConfiguration in @WebMvcTest
Closes gh-14400
2018-09-11 11:29:17 +01:00
Phillip Webb
8c34e053f5 Update copyright header of changed files 2018-09-05 13:09:03 -07:00
Andy Wilkinson
8ee4775820 Polish 2018-09-04 20:46:35 +01:00
Madhura Bhave
b16927ce91 Add @WithMockUser to tests
See gh-14227
2018-08-30 18:55:02 -07:00
Madhura Bhave
8f946260d2 Update copyright year for changed files 2018-08-30 16:56:37 -07:00
Madhura Bhave
0384a88b57 Include web security config classes in @WebMvcTest
Security config classes are not included when the
secure flag is set to false.

Closes gh-6514
2018-08-30 16:47:31 -07:00
Madhura Bhave
d91c71b508 Deprecate secure flag on @WebMvcTest
Closes gh-14227
2018-08-30 16:47:31 -07:00
Madhura Bhave
f3fa952cbc Support WebExceptionHandler in @WebFluxTest
Closes gh-13627
2018-08-27 16:35:49 -07:00
Johnny Lim
9602a32a8d Polish
Closes gh-14172
2018-08-23 11:40:44 +02:00
Johnny Lim
c95b339f02 Polish
Closes gh-14149
2018-08-22 10:38:00 +02:00
Andy Wilkinson
075a745e32 Polish "Allow properties to be configured using slice test annotations"
Closes gh-14052
2018-08-16 11:27:49 +01:00
artsiom
0cf1749e85 Allow properties to be configured using slice test annotations
See gh-14052
2018-08-16 11:27:49 +01:00
Andy Wilkinson
f10377bdb7 Polish "Add support for multiple REST Docs configuration customizers"
Closes gh-13498
2018-08-16 09:48:03 +01:00
Eddú Meléndez
4d310f0d5a Add support for multiple REST Docs configuration customizers
This commit introduces support for multiple configuration customizers
for REST Docs with MockMvc, WebTestClient, and REST Assured.

Closes gh-13498
2018-08-16 09:48:03 +01:00
Stephane Nicoll
143e4f026f Merge branch '2.0.x' 2018-08-01 08:48:09 +02:00
dreis2211
66b1742f96 Optimize some StringBuilder.append() calls
Closes gh-13961
2018-08-01 08:41:03 +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
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
Phillip Webb
b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb
9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Madhura Bhave
4fee54cf24 Expose a TestDispatcherServlet bean in the MockMvcAutoConfiguration
This commit also contains changes to `ServletContextInitializerBeans`.
`ServletContextInitializerBeans` can now be configured to only look
for specific ServletContextInitializer subclasses, defaulting to
ServletContextIntializer.class. `SpringBootMockMvcBuilderCustomizer`
only cares about filters so it was unnecessary to look for all
`ServletContextInitializer`s. Additionally, adapting `Servlet` beans
caused a cycle once the `DispatcherServlet` bean was added and the
customizer only needs to adapt `Filter` beans.

Closes gh-13241
2018-07-17 13:00:54 -07: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
8cc0d5577e Avoid unwanted bean overrides in spring-boot-test-autoconfigure
See gh-13609
2018-07-10 19:54:48 +01: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