Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-02-07 23:07:22 +01:00
parent b4de3845c0 cc740dfd93
commit 7cde283066
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -30,7 +30,7 @@ ext {
aspectjVersion = "1.9.2"
freemarkerVersion = "2.3.28"
groovyVersion = "2.5.5"
groovyVersion = "2.5.6"
hsqldbVersion = "2.4.1"
jackson2Version = "2.9.8"
jettyVersion = "9.4.14.v20181114"
@@ -277,7 +277,7 @@ configure(rootProject) {
testCompile("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:5.1.16.Final")
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
}
artifacts {

6
spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
View File

@@ -289,7 +289,8 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
* Apply {@link BeanPostProcessor BeanPostProcessors} to the given existing bean
* instance, invoking their {@code postProcessBeforeInitialization} methods.
* The returned bean instance may be a wrapper around the original.
* @param existingBean the new bean instance
* @param existingBean the existing bean instance
* @param beanName the name of the bean, to be passed to it if necessary
* (only passed to {@link BeanPostProcessor BeanPostProcessors};
* can follow the {@link #ORIGINAL_INSTANCE_SUFFIX} convention in order to
* enforce the given instance to be returned, i.e. no proxies etc)
@@ -305,7 +306,8 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
* Apply {@link BeanPostProcessor BeanPostProcessors} to the given existing bean
* instance, invoking their {@code postProcessAfterInitialization} methods.
* The returned bean instance may be a wrapper around the original.
* @param existingBean the new bean instance
* @param existingBean the existing bean instance
* @param beanName the name of the bean, to be passed to it if necessary
* (only passed to {@link BeanPostProcessor BeanPostProcessors};
* can follow the {@link #ORIGINAL_INSTANCE_SUFFIX} convention in order to
* enforce the given instance to be returned, i.e. no proxies etc)

6
src/docs/asciidoc/web/webmvc.adoc
View File

@@ -221,9 +221,9 @@ The following table lists the special beans detected by the `DispatcherServlet`:
The mapping is based on some criteria, the details of which vary by `HandlerMapping`
implementation.
The two main `HandlerMapping` implementations are `RequestMappingHandlerMapping`( which
supports `@RequestMapping` annotated methods) and `SimpleUrlHandlerMapping` (which
maintains explicit registrations of URI path patterns to handlers).
The two main `HandlerMapping` implementations are `RequestMappingHandlerMapping`
(which supports `@RequestMapping` annotated methods) and `SimpleUrlHandlerMapping`
(which maintains explicit registrations of URI path patterns to handlers).
| `HandlerAdapter`
| Help the `DispatcherServlet` to invoke a handler mapped to a request, regardless of