root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
28,946 Commits 22 Branches 345 Tags 285 MiB
Commit Graph

376 Commits

Author SHA1 Message Date
Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Dmytro Nosan 9d052bbe5e Include WebFilter beans in WebFluxTest slice 
See gh-17601
 2019-07-22 12:38:48 -07:00
Dmytro Nosan 6859a89cf3 Include HandlerInterceptor beans in WebMvcTest slice 
See gh-17600
 2019-07-22 12:34:11 -07:00
Stephane Nicoll e5ca9df478 Merge branch '2.1.x' 2019-07-19 11:33:16 +02:00
Stephane Nicoll 8eb6886388 Fix code formating 2019-07-19 11:29:12 +02:00
Stephane Nicoll 08afbe286c Merge branch '2.1.x' 
Closes gh-17580
 2019-07-19 10:35:01 +02:00
Stephane Nicoll b8d92cb0ae Fix @DataJdbcTest to be transactional as advertized 
Closes gh-17513
 2019-07-19 10:33:59 +02:00
Stephane Nicoll 5903e9a57a Polish 2019-07-19 10:33:52 +02:00
Phillip Webb 30b5ba87ae Merge branch '2.0.x' into 2.1.x 2019-07-17 21:48:01 +01:00
Andy Wilkinson 808b373def Merge branch '2.1.x' 
Closes gh-17552
 2019-07-17 12:45:48 +01:00
Andy Wilkinson 9dabc0e14d Cleared deferred lines after each test 
Previously, DeferredLinesWriter would collect MockMvc output from
every test that has executed. If a test eventually failed, the
output from every test up to including the one that had failed would
be output, rather than just the output for the test that has just
failed.

This commit clears the deferred lines after each test, thereby
ensuring that when a failure occurs only the lines from the failing
test are output.

Fixes gh-17551
 2019-07-17 12:29:41 +01:00
Stephane Nicoll a3e94f4412 Harmonize component scan in slice tests 
This commit updates ConfigurationPropertiesScanRegistrar to apply the
same component scan filters than the ones applied on standard classpath
scanning.

As a result, configuration properties scanning is automatically disabled
in slice tests and can be included by an explicit import or a dedicated
TypeFilter implementation if necessary.

Closes gh-16659
 2019-07-15 15:05:12 +02:00
Phillip Webb eff1147ccc Rename classpath runner package 
Remove `runner` since we're no longer tied to JUnit 4.

See gh-17491
 2019-07-15 13:40:26 +01:00
Phillip Webb 1117fdb2b3 Make ModifiedClassPathExtension package private 
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.

See gh-17491
 2019-07-15 13:38:26 +01:00
Phillip Webb 4fe5e9e31e Remove direct junit-platform-launcher dependency 
Replace any direct `junit-platform-launcher` dependencies and instead
rely on the test runner providing it. Launcher related class are not
handled via reflection.

This update allows us to workaround SUREFIRE-1679.

Closes gh-17517
 2019-07-15 13:35:08 +01:00
dreis2211 0f0278e69b Migrate ModifiedClassPath tests to JUnit 5 
Migrate the remaining JUnit 4 tests to JUnit 5, making use of the
new `ModifiedClassPathExtension`.

See gh-17491
 2019-07-15 00:31:03 +01:00
dreis2211 ca1808ecae Migrate to MockRestServiceServer 
Migrate `RestClientTestWithoutJacksonIntegrationTests` to use
Spring's `MockRestServiceServer`.

See gh-17491
 2019-07-15 00:26:16 +01:00
Phillip Webb 01933f9b06 Merge previously split strings 
Merge some string lines that were previously split because of the
90 chars wide formatting.
 2019-07-15 00:24:19 +01:00
Phillip Webb c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Phillip Webb a66c4d3096 Unify method visibility of private classes 
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
 2019-07-03 11:39:47 -07:00
Phillip Webb 605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb c62b6b4ccd Merge branch '2.1.x' 2019-06-28 12:22:45 -07:00
Phillip Webb de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods 
See gh-17292
 2019-06-21 18:09:05 +02:00
Andy Wilkinson a189e4cf96 Merge branch '2.1.x' 
Closes gh-17220
 2019-06-17 14:05:16 +01:00
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest" 
See gh-16485
 2019-06-17 13:54:41 +01:00
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest 
See gh-16485
 2019-06-17 13:37:55 +01:00
Andy Wilkinson 78f51a490c Merge branch '2.1.x' 
Closes gh-17213
 2019-06-17 10:59:16 +01:00
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests" 
See gh-17066
 2019-06-17 10:55:35 +01:00
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests 
See gh-17066
 2019-06-17 10:55:35 +01:00
Phillip Webb b3d5cd538d Add JUnit 5 checkstyle rules 
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
 2019-06-10 16:16:45 -07:00
Andy Wilkinson b18fffaf14 Move tests to JUnit 5 wherever possible 2019-06-07 12:25:54 +01:00
Andy Wilkinson aef92b9295 Merge branch '2.1.x' 
Closes gh-17079
 2019-06-07 11:00:44 +01:00
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x 
Closes gh-17078
 2019-06-07 10:50:34 +01:00
Andy Wilkinson c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb 5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
fidel 2ec0996a6f Fix typo in javadoc 
See gh-17044
 2019-06-02 09:54:11 +02:00
Phillip Webb 0fcc561163 Update copyright header of changed files 2019-05-31 22:41:00 -07:00
Andy Wilkinson 0644a79401 Repackage output capture and always use extension declaratively 
Closes gh-17029
 2019-05-31 18:33:10 +01:00
Phillip Webb ad5e905bd7 Update copyright header of changed files 2019-05-30 11:30:43 -07:00
Phillip Webb 68aec8b6ee Polish 2019-05-30 11:30:27 -07:00
Andy Wilkinson 080a2f5c3b Align with Framework’s removal of charset attribute from application/json 
Closes gh-16979
 2019-05-28 10:58:23 +01:00
Andy Wilkinson 23f803c6b6 Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library 
Closes gh-15555
 2019-05-22 14:50:15 +01:00
Johnny Lim 652906ec7c Use MergedAnnotation.getRoot() in PropertyMappingCheckBeanPostProcessor 
Closes gh-16745
 2019-05-21 09:26:27 +02:00
Phillip Webb 3a9ca5fa30 Update copyright header of changed files 2019-05-14 21:05:53 -07:00
Phillip Webb ed998ef0d3 Update copyright header of changed files 2019-05-14 21:04:50 -07:00
Madhura Bhave f1786c357b Revert "Disable ConfigurationProperties scanning for slice tests" 
This reverts commit 3b4ff7d746.
The commit caused the build to fail because it disabled
`@ConfigurationPropertiesScan` completely in slice tests. It
did not take into account components that were explicitly included
in slice tests using the `components` attribute. Since `@ConfigurationPropertiesScan`
replaces `@Component` and `@EnableConfigurationProperties`, these components
are no longer registered even though explicitly included.
 2019-05-11 09:59:36 -07:00
Madhura Bhave 3b4ff7d746 Disable ConfigurationProperties scanning for slice tests 
Closes gh-16659
 2019-05-10 14:43:55 -07:00
Andy Wilkinson 552345fcd1 Disable more @Bean method proxying 
Previously, due to a quirk in Spring Framework, it was necessary to use bean method
proxying in @Configuration classes that define one or more FactoryBeans. This quirk has
now been addressed so this commit disables bean method proxying where it is now no longer
needed.

Closes gh-16533
 2019-05-10 10:16:22 +01:00
Madhura Bhave 684a1c7a3c Migrate tests to JUnit5 testcontainer extensions 
Closes gh-15456
 2019-05-08 16:05:44 +02:00
Phillip Webb 17aaf26590 Use consistent javadoc style for annotation links 
Closes gh-13920
 2019-04-24 19:37:59 -07:00
Phillip Webb 1e44aba772 Fix compiler warnings and polish 
Fix various compiler warnings and apply a little polish.
 2019-04-24 19:37:42 -07:00
Phillip Webb b879972d0d Migrate to MergedAnnotations API 
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.

Closes gh-16551
 2019-04-18 15:40:02 -07:00
Madhura Bhave dabe75a281 Merge branch '2.1.x' 2019-04-15 17:10:07 -07:00
Madhura Bhave f0544fb86f Polish 2019-04-15 17:09:47 -07:00
Madhura Bhave 1d20c73d22 Make nested classes in JsonTestersAutoConfiguration package private 
Closes gh-15444
 2019-04-15 16:03:31 -07:00
Johnny Lim 4392d7c2ed Polish 
Closes gh-16494
 2019-04-10 08:03:18 +02:00
Stephane Nicoll c432288ed1 Migrate ApplicationContext to common hierarchy 
This commit migrates `AnnotationConfigReactiveWebApplicationContext`
parent to the `GenericApplicationContext` abstraction. Any use of
`AnnotationConfigWebApplicationContext` is also removed as it also
inherits from the `AbstractRefreshableApplicationContext` outdated
hierarchy.

A new `AnnotationConfigServletWebApplicationContext` context is
introduced instead, extending from `GenericApplicationContext` and
providing the counter part of the reactive context for the Servlet-based
web app tests.

See gh-16096
 2019-04-05 14:17:41 +02:00
Phillip Webb ad7eebee9e Merge branch '2.1.x' 2019-04-03 17:00:25 -07:00
Phillip Webb f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb 2376f973f4 Merge branch '2.1.x' 2019-04-02 13:46:36 -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 270554d3cd Merge branch '2.1.x' 2019-03-29 11:40:15 +01: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 878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00: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 0d136f0573 Merge branch '2.1.x' 2019-03-20 18:00:48 -07: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 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00: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
dreis2211 dda0b3e2a1 Remove explicit types 
Closes gh-16265
 2019-03-20 09:44:51 +01:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +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
Andy Wilkinson 68bfb020aa Reduce need for bean method proxying and disable where not needed 
Closes gh-9068
 2019-03-12 13:18:42 +00:00
Stephane Nicoll a44a55e948 Merge branch '2.1.x' 2019-03-12 11:07:53 +01: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
Phillip Webb 64a2e8d67f Update copyright year for changed files 2019-03-11 22:15:36 -07:00
Andy Wilkinson aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson 8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson 89bb973745 Merge branch '2.1.x' 2019-03-09 20:02:05 +00:00
Andy Wilkinson 7153525ee2 Annotation @JsonTest with @ExtendWith(SpringExtension.class) 
Closes gh-16183
 2019-03-09 20:00:06 +00:00
Andy Wilkinson b8dff5fe17 Merge branch '2.1.x' 2019-03-07 10:20:29 +00:00
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible 
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
 2019-03-06 11:20:51 +00:00
Stephane Nicoll 1b55f0ccf9 Merge branch '2.1.x' 2019-03-04 15:19:35 +01:00
Johnny Lim 3242e89271 Polish 
See gh-16083
 2019-03-04 15:18:51 +01:00
Stephane Nicoll f90bfff132 Merge branch '2.1.x' 2019-03-04 15:00:21 +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
Stephane Nicoll 7b8563a877 Merge branch '2.1.x' 2019-03-04 09:29:13 +01:00
dreis2211 be445f6346 Use AssertJ facilities for expected exceptions 
See gh-16066
 2019-03-04 08:45:42 +01:00
Madhura Bhave 64b7466d51 Remove secure flag from AutoConfigureMockMvc 
Closes gh-13822
 2019-02-28 13:15:00 -08:00
Stephane Nicoll 2ad234b605 Adapt to breaking change in Spring Hateoas 2019-02-28 13:42:27 +01:00
dreis2211 2ab4ce03db Fix deprecations 
Closes gh-16037
 2019-02-26 16:49:13 +01:00
Andy Wilkinson de0c065625 Inject single-use configuration dependencies into bean methods 
Closes gh-15751
 2019-02-20 17:02:43 +00:00
Andy Wilkinson 747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00: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 1c90a89acd Merge branch '2.1.x' 2019-02-12 09:47:42 +00:00
Andy Wilkinson 2884d99a5d Complete move to Testcontainers' Neo4j container 
Closes gh-15638
 2019-02-12 09:46:11 +00:00
Andy Wilkinson 7e51e1a076 Merge branch '2.1.x' 2019-02-12 09:26:59 +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 d9ec48ef12 Merge branch '2.1.x' 2019-02-11 16:13:52 +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 45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +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 33f2bd4d61 Merge branch '2.1.x' 2019-01-14 08:13:37 -05: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
dreis2211 3544ed045b Drop ContentContainingCondition in favor of Assertions.contentOf 
Closes gh-15429
 2018-12-20 18:05:56 +01: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
Andy Wilkinson 9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson 9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson 8c68da0882 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:24:53 +00:00
Stephane Nicoll 6207b46bc6 Merge branch '2.1.x' 2018-12-17 17:07:58 +01:00
dreis2211 948902f090 Avoid unnecessary usage of ReflectionTestUtils 
Closes gh-15482
 2018-12-17 17:07:23 +01:00
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output 
Closes gh-15471
 2018-12-14 17:50:20 +00:00
Stephane Nicoll ba29788482 Polish "Replace explicit generic type with diamond operator" 
Closes gh-15424
 2018-12-09 11:43:28 +01:00
igor-suhorukov a2ebba8db1 Replace explicit generic type with diamond operator 
See gh-15424
 2018-12-09 11:42:27 +01:00
Madhura Bhave 59d2b0a3fb Upgrade tests to Junit5 
See gh-14737
 2018-12-05 17:49:09 -08:00
dreis2211 f57f16c190 Avoid premature declaration of variables 
Closes gh-15215
 2018-12-03 10:59:20 +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