Commit Graph

355 Commits (5517cd06dfe4fc47453f7c87f8d9e3bf62e12243)

Author SHA1 Message Date
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 5 years ago
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 5 years ago
Phillip Webb c62b6b4ccd Merge branch '2.1.x' 5 years ago
Phillip Webb de35efd1ef Merge branch '2.0.x' into 2.1.x 5 years ago
Phillip Webb bb34846630 Merge branch '1.5.x' into 2.0.x 5 years ago
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
5 years ago
Andy Wilkinson a189e4cf96 Merge branch '2.1.x'
Closes gh-17220
6 years ago
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
See gh-16485
6 years ago
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest
See gh-16485
6 years ago
Andy Wilkinson 78f51a490c Merge branch '2.1.x'
Closes gh-17213
6 years ago
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests"
See gh-17066
6 years ago
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests
See gh-17066
6 years ago
Phillip Webb b3d5cd538d Add JUnit 5 checkstyle rules
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
6 years ago
Andy Wilkinson b18fffaf14 Move tests to JUnit 5 wherever possible 6 years ago
Andy Wilkinson aef92b9295 Merge branch '2.1.x'
Closes gh-17079
6 years ago
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
6 years ago
Andy Wilkinson c6c139d980 Merge branch '1.5.x' into 2.0.x 6 years ago
Phillip Webb d306b31ce9 Merge branch '2.1.x' 6 years ago
Phillip Webb ccfbd03482 Merge branch '2.0.x' into 2.1.x 6 years ago
Phillip Webb 5fba43aa31 Merge branch '1.5.x' into 2.0.x 6 years ago
fidel 2ec0996a6f Fix typo in javadoc
See gh-17044
6 years ago
Phillip Webb 0fcc561163 Update copyright header of changed files 6 years ago
Andy Wilkinson 0644a79401 Repackage output capture and always use extension declaratively
Closes gh-17029
6 years ago
Phillip Webb ad5e905bd7 Update copyright header of changed files 6 years ago
Phillip Webb 68aec8b6ee Polish 6 years ago
Andy Wilkinson 080a2f5c3b Align with Framework’s removal of charset attribute from application/json
Closes gh-16979
6 years ago
Andy Wilkinson 23f803c6b6 Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library
Closes gh-15555
6 years ago
Johnny Lim 652906ec7c Use MergedAnnotation.getRoot() in PropertyMappingCheckBeanPostProcessor
Closes gh-16745
6 years ago
Phillip Webb 3a9ca5fa30 Update copyright header of changed files 6 years ago
Phillip Webb ed998ef0d3 Update copyright header of changed files 6 years ago
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.
6 years ago
Madhura Bhave 3b4ff7d746 Disable ConfigurationProperties scanning for slice tests
Closes gh-16659
6 years ago
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
6 years ago
Madhura Bhave 684a1c7a3c Migrate tests to JUnit5 testcontainer extensions
Closes gh-15456
6 years ago
Phillip Webb 17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
6 years ago
Phillip Webb 1e44aba772 Fix compiler warnings and polish
Fix various compiler warnings and apply a little polish.
6 years ago
Phillip Webb b879972d0d Migrate to MergedAnnotations API
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.

Closes gh-16551
6 years ago
Madhura Bhave dabe75a281 Merge branch '2.1.x' 6 years ago
Madhura Bhave f0544fb86f Polish 6 years ago
Madhura Bhave 1d20c73d22 Make nested classes in JsonTestersAutoConfiguration package private
Closes gh-15444
6 years ago
Johnny Lim 4392d7c2ed Polish
Closes gh-16494
6 years ago
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
6 years ago
Phillip Webb ad7eebee9e Merge branch '2.1.x' 6 years ago
Phillip Webb f12ab1ff90 Update copyright header of changed files 6 years ago
Phillip Webb 2376f973f4 Merge branch '2.1.x' 6 years ago
Phillip Webb 47c6bf741d Merge branch '2.0.x' into 2.1.x 6 years ago
Phillip Webb 07c000c5b7 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 270554d3cd Merge branch '2.1.x' 6 years ago
Stephane Nicoll 090f5f5397 Polish "Add error rendering support with @WebFluxTest"
Closes gh-16266
6 years ago
Ali Dehghani 53e7484d87 Add error rendering support with @WebFluxTest
See gh-16266
6 years ago
Andy Wilkinson 878a635bfb Merge branch '2.1.x' 6 years ago
Andy Wilkinson 864942ad4f Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson ba4671f0ab Merge branch '1.5.x' into 2.0.x 6 years ago
Madhura Bhave 0d136f0573 Merge branch '2.1.x' 6 years ago
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
6 years ago
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 6 years ago
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 6 years ago
dreis2211 dda0b3e2a1 Remove explicit types
Closes gh-16265
6 years ago
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 6 years ago
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 6 years ago
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
6 years ago
Andy Wilkinson 68bfb020aa Reduce need for bean method proxying and disable where not needed
Closes gh-9068
6 years ago
Stephane Nicoll a44a55e948 Merge branch '2.1.x' 6 years ago
Stephane Nicoll 161c0b9fad Polish contribution
Closes gh-16170
6 years ago
ayudovin 51013421f2 Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
See gh-16170
6 years ago
Stephane Nicoll 078bd890a6 Merge branch '2.0.x' into 2.1.x 6 years ago
Stephane Nicoll 50d0b4df46 Polish 6 years ago
Phillip Webb 64a2e8d67f Update copyright year for changed files 6 years ago
Andy Wilkinson aa2008bc5a Merge branch '2.1.x' 6 years ago
Andy Wilkinson 8c3cec8f13 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 89bb973745 Merge branch '2.1.x' 6 years ago
Andy Wilkinson 7153525ee2 Annotation @JsonTest with @ExtendWith(SpringExtension.class)
Closes gh-16183
6 years ago
Andy Wilkinson b8dff5fe17 Merge branch '2.1.x' 6 years ago
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
6 years ago
Stephane Nicoll 1b55f0ccf9 Merge branch '2.1.x' 6 years ago
Johnny Lim 3242e89271 Polish
See gh-16083
6 years ago
Stephane Nicoll f90bfff132 Merge branch '2.1.x' 6 years ago
Stephane Nicoll 2099093978 Merge branch '2.0.x' into 2.1.x 6 years ago
Stephane Nicoll b8cbd0c17f Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 7b8563a877 Merge branch '2.1.x' 6 years ago
dreis2211 be445f6346 Use AssertJ facilities for expected exceptions
See gh-16066
6 years ago
Madhura Bhave 64b7466d51 Remove secure flag from AutoConfigureMockMvc
Closes gh-13822
6 years ago
Stephane Nicoll 2ad234b605 Adapt to breaking change in Spring Hateoas 6 years ago
dreis2211 2ab4ce03db Fix deprecations
Closes gh-16037
6 years ago
Andy Wilkinson de0c065625 Inject single-use configuration dependencies into bean methods
Closes gh-15751
6 years ago
Andy Wilkinson 747e419db1 Merge branch '2.1.x' 6 years ago
Andy Wilkinson 9fb0b97f96 Decorate test containers so tests are skipped without Docker
Closes gh-15901
Closes gh-15638
6 years ago
Andy Wilkinson 1c90a89acd Merge branch '2.1.x' 6 years ago
Andy Wilkinson 2884d99a5d Complete move to Testcontainers' Neo4j container
Closes gh-15638
6 years ago
Andy Wilkinson 7e51e1a076 Merge branch '2.1.x' 6 years ago
Andy Wilkinson 01b8e2c834 Polish “Replace custom Neo4j container with Testcontainers version”
See gh-15638
6 years ago
Michael Simons 316126e8f0 Replace custom Neo4j container with Testcontainers version
See gh-15638
6 years ago
Andy Wilkinson d9ec48ef12 Merge branch '2.1.x' 6 years ago
Andy Wilkinson 3f32fbd0de Polish "Remove unwanted @Nullable annotations"
See gh-15876
6 years ago
wonwoo 2855321074 Remove unwanted @Nullable annotations
See gh-15876
6 years ago
Andy Wilkinson 45cc649c7d Merge branch '2.1.x' 6 years ago
Andy Wilkinson 82bc87560c Use AssertJ’s exception assertions rather than fail
Closes gh-15761
6 years ago
Stephane Nicoll 33f2bd4d61 Merge branch '2.1.x' 6 years ago
Stephane Nicoll 485bdc9901 Polish "Remove redundant interface modifiers"
Closes gh-15694
6 years ago
igor-suhorukov 2d873c78fe Remove redundant interface modifiers
See gh-15694
6 years ago
dreis2211 3544ed045b Drop ContentContainingCondition in favor of Assertions.contentOf
Closes gh-15429
6 years ago
Andy Wilkinson 3a7406fe3a Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 0741c90489 Avoid blocking on a Mono indefinitely
Closes gh-15535
6 years ago
Andy Wilkinson 9d2d6d5812 Merge branch '2.1.x' 6 years ago
Andy Wilkinson 9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 8c68da0882 Avoid blocking on a Mono indefinitely
Closes gh-15535
6 years ago
Stephane Nicoll 6207b46bc6 Merge branch '2.1.x' 6 years ago
dreis2211 948902f090 Avoid unnecessary usage of ReflectionTestUtils
Closes gh-15482
6 years ago
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
6 years ago
Stephane Nicoll ba29788482 Polish "Replace explicit generic type with diamond operator"
Closes gh-15424
6 years ago
igor-suhorukov a2ebba8db1 Replace explicit generic type with diamond operator
See gh-15424
6 years ago
Madhura Bhave 59d2b0a3fb Upgrade tests to Junit5
See gh-14737
6 years ago
dreis2211 f57f16c190 Avoid premature declaration of variables
Closes gh-15215
6 years ago
Phillip Webb ba1ef52e39 Merge branch '2.0.x' 6 years ago
Phillip Webb 893d5666be Update copyright year for changed files 6 years ago
Andy Wilkinson 6729e56f6b Merge branch '2.0.x' 6 years ago
Andy Wilkinson e74b084c67 Auto-configure codec customizations and JSON when using @WebFluxTest
Closes gh-15070
6 years ago
Phillip Webb cccf5e6d2b Merge branch '2.0.x' 6 years ago
Phillip Webb 3baf782822 Merge branch '1.5.x' into 2.0.x 6 years ago
dreis2211 3b4b0641d9 Polish some Map operations
Closes gh-15153
6 years ago
Phillip Webb f3fa20b2d1 Polish 6 years ago
Stephane Nicoll 474da80b4d Revert "Restructure of security packages"
See gh-14412
6 years ago
Stephane Nicoll 39f8b685df Merge branch '2.0.x' 6 years ago
Johnny Lim 47daf96c48 Polish
See gh-14843
6 years ago
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
6 years ago
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
6 years ago
Phillip Webb 5c7a4523ea Merge '2.0.x' 6 years ago
Phillip Webb 6aedb69443 Update copyright year for changed files 6 years ago
Phillip Webb d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
6 years ago
Johnny Lim b079eeff1a Polish
Closes gh-14621
6 years ago
Stephane Nicoll 2d36a6f952 Merge branch '2.0.x' 6 years ago
Johnny Lim 1eca492c5e Polish
See gh-14621
6 years ago
Andy Wilkinson 726579a910 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 89f5cfc5a4 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 4b00dc8a5c Add support for Spring Data JDBC (auto-config, starter, and test slice)
Closes gh-14489
6 years ago
Andy Wilkinson cc6cf880cf Stop using ObjectProvider<List> and ObjectProvider<Collection>
Closes gh-14467
6 years ago
Johnny Lim 521f746151 Polish
Closes gh-14517
6 years ago
Johnny Lim fd97f07209 Use meaningful name for MockServerConfigurer bean
Closes gh-14512
6 years ago
Phillip Webb 84b6fff8c0 Update copyright year for changed files 6 years ago
Phillip Webb 57ec09a55f Polish 6 years ago
Madhura Bhave ab6bdc7ae2 Apply springSecurity configurer to WebTestClient
Also, @WebFluxTest now adds any ServerHttpSecurity beans
to the context.

Closes gh-13632
6 years ago
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
6 years ago
LEVI PAUL 74891a75bb Include TaskExecutionAutoConfiguration in @WebMvcTest
Closes gh-14400
6 years ago
Phillip Webb 8c34e053f5 Update copyright header of changed files 6 years ago
Andy Wilkinson 8ee4775820 Polish 6 years ago
Madhura Bhave b16927ce91 Add @WithMockUser to tests
See gh-14227
6 years ago
Madhura Bhave 8f946260d2 Update copyright year for changed files 6 years ago
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
6 years ago
Madhura Bhave d91c71b508 Deprecate secure flag on @WebMvcTest
Closes gh-14227
6 years ago