fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,065 Commits 22 Branches 339 Tags
Commit Graph

285 Commits

Author SHA1 Message Date
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 3b4ff7d74641bd453554df22bc4eaa55da4522d4.
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