root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity
20,847 Commits 18 Branches 337 Tags 365 MiB
Java 97.7%
Kotlin 2.1%
Go to file
Sam Brannen 96da1ff9ea Support @RestControllerAdvice in Standalone MockMvc again 
Since Spring Framework 5.2, @RestControllerAdvice registered with
MockMvc when using MockMvcBuilders.standaloneSetup() has no longer been
properly supported if annotation attributes were declared in the
@RestControllerAdvice annotation. Prior to 5.2, this was not an issue.

The cause for this regression is two-fold.

1. Commit 50c257794f refactored
   DefaultListableBeanFactory so that findAnnotationOnBean() supports
   merged annotations; however, that commit did not refactor
   StaticListableBeanFactory#findAnnotationOnBean() to support merged
   annotations.

2. Commit 978adbdae7 refactored
   ControllerAdviceBean so that a merged @ControllerAdvice annotation
   is only looked up via ApplicationContext#findAnnotationOnBean().

The latter relies on the fact that findAnnotationOnBean() supports
merged annotations (e.g., @RestControllerAdvice as a merged instance of
@ControllerAdvice). Behind the scenes, MockMvcBuilders.standaloneSetup()
creates a StubWebApplicationContext which internally uses a
StubBeanFactory which extends StaticListableBeanFactory. Consequently,
since the implementation of findAnnotationOnBean() in
StaticListableBeanFactory was not updated to support merged annotations
like it was in DefaultListableBeanFactory, we only see this regression
with the standalone MockMvc support and not with MockMvc support for an
existing WebApplicationContext or with standard Spring applications
using an ApplicationContext that uses DefaultListableBeanFactory.

This commit fixes this regression by supporting merged annotations in
StaticListableBeanFactory#findAnnotationOnBean() as well.

Closes gh-25520
 		2020-08-05 17:40:16 +02:00
.github Configure Gradle wrapper validation action 2020-06-02 14:43:45 +02:00
buildSrc Fix typo in buildSrc/README.md 2020-03-14 10:06:25 +01:00
framework-bom Remove scope information from published BOM 2019-09-18 15:27:59 +02:00
gradle Upgrade to spring-doc-resources 0.2.1 2020-04-14 13:36:11 +02:00
integration-tests Implement reliable advice invocation order within an @Aspect 2020-06-08 14:18:28 +02:00
spring-aop Polish contribution 2020-07-22 17:26:59 +02:00
spring-aspects Polishing 2020-06-23 11:35:22 +02:00
spring-beans Support @RestControllerAdvice in Standalone MockMvc again 2020-08-05 17:40:16 +02:00
spring-context Polish contribution 2020-07-22 17:26:59 +02:00
spring-context-indexer Polish contribution 2020-03-26 16:52:24 +01:00
spring-context-support Consistent abstract declaration of "Abstract" base classes 2020-06-11 23:43:41 +02:00
spring-core Use Spliterators.emptySpliterator() in TypeMappedAnnotations 2020-08-03 13:44:02 +02:00
spring-expression Use autoboxing instead of explicit wrapping in tests 2020-04-01 14:34:20 +02:00
spring-instrument Delete obsolete log4j config 2020-03-18 17:01:01 +01:00
spring-jcl Polishing 2020-01-28 21:56:35 +01:00
spring-jdbc Unwrap SqlParameterValue for disposable value detection in cleanupParameters 2020-07-19 19:59:15 +02:00
spring-jms Polish contribution 2020-07-22 17:26:59 +02:00
spring-messaging Refine use of substring operations 2020-07-22 17:26:42 +02:00
spring-orm Consistently refer to FlushMode.MANUAL instead of outdated NEVER 2020-05-29 15:51:54 +02:00
spring-oxm Use SingletonSupplier for XStream instance in XStreamMarshaller 2020-05-07 12:35:32 +02:00
spring-test Support @RestControllerAdvice in Standalone MockMvc again 2020-08-05 17:40:16 +02:00
spring-tx Polishing 2020-06-23 23:20:45 +02:00
spring-web Reset charset field in MockHttpServletResponse 2020-08-01 14:01:39 +02:00
spring-webflux Polish contribution 2020-07-22 17:26:59 +02:00
spring-webmvc Polish contribution 2020-07-22 17:26:59 +02:00
spring-websocket Polish contribution 2020-07-22 17:26:59 +02:00
src Wording changes 2020-07-20 17:14:13 +02:00
.editorconfig Add EditorConfig 2017-06-12 08:07:54 +02:00
.gitattributes Ensure line endings for binary files are not modified in Git 2019-10-18 11:56:18 +02:00
.gitignore Rename non-Framework project modules 2019-08-21 14:32:25 +02:00
.mailmap Change gopivotal.com to pivotal.io 2014-10-05 18:12:50 +02:00
CODE_OF_CONDUCT.adoc URL Cleanup 2019-03-21 15:08:55 -05:00
CONTRIBUTING.md Update StackOverflow link 2020-04-20 12:32:11 +01:00
LICENSE.txt Add LICENSE.txt file 2019-08-20 22:01:12 +02:00
README.md Fix grammar 2019-11-05 15:20:18 +01:00
SECURITY.md Create SECURITY.md 2019-05-23 11:36:52 -04:00
build.gradle Upgrade to Jetty Reactive HttpClient 1.1.4 2020-07-20 16:47:52 +02:00
gradle.properties Next Development Version 2020-07-21 08:20:59 +00:00
gradlew Upgrade to Gradle 5.6 2019-08-17 19:20:36 +02:00
gradlew.bat Revert "Upgrade to Gradle 5.6.3" 2019-10-18 10:38:40 +02:00
import-into-eclipse.md Polishing regarding AJDT versions 2020-01-13 17:15:27 +01:00
import-into-idea.md URL Cleanup 2019-03-21 15:08:55 -05:00
settings.gradle Unpublish Gradle metadata 2019-12-02 16:43:02 +01:00

README.md

Spring Framework Build Status

This is the home of the Spring Framework: the foundation for all Spring projects. Collectively the Spring Framework and the family of Spring projects are often referred to simply as "Spring".

Spring provides everything required beyond the Java programming language for creating enterprise applications for a wide range of scenarios and architectures. Please read the Overview section as reference for a more complete introduction.

Code of Conduct

This project is governed by the Spring Code of Conduct. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.

Access to Binaries

For access to artifacts or a distribution zip, see the Spring Framework Artifacts wiki page.

Documentation

The Spring Framework maintains reference documentation (published and source), Github wiki pages, and an API reference. There are also guides and tutorials across Spring projects.

Build from Source

See the Build from Source Wiki page and the CONTRIBUTING.md file.

Stay in Touch

Follow @SpringCentral, @SpringFramework, and its team members on Twitter. In-depth articles can be found at The Spring Blog, and releases are announced via our news feed.

License

The Spring Framework is released under version 2.0 of the Apache License.