Skip to content

Commit 2e4d7e4

Browse files
committed
Polishing
1 parent c6be3b3 commit 2e4d7e4

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
/**
5252
* {@link org.springframework.beans.factory.FactoryBean} implementation that builds an
53-
* AOP proxy based on beans in Spring {@link org.springframework.beans.factory.BeanFactory}.
53+
* AOP proxy based on beans in a Spring {@link org.springframework.beans.factory.BeanFactory}.
5454
*
5555
* <p>{@link org.aopalliance.intercept.MethodInterceptor MethodInterceptors} and
5656
* {@link org.springframework.aop.Advisor Advisors} are identified by a list of bean
@@ -60,11 +60,12 @@
6060
* to use the "targetName"/"target"/"targetSource" properties instead.
6161
*
6262
* <p>Global interceptors and advisors can be added at the factory level. The specified
63-
* ones are expanded in an interceptor list where a "xxx*" entry is included in the
64-
* list, matching the given prefix with the bean names (e.g. "global*" would match
65-
* both "globalBean1" and "globalBean2", "*" all defined interceptors). The matching
66-
* interceptors get applied according to their returned order value, if they implement
67-
* the {@link org.springframework.core.Ordered} interface.
63+
* ones are expanded in an interceptor list where an "xxx*" entry is included in the
64+
* list, matching the given prefix with the bean names &mdash; for example, "global*"
65+
* would match both "globalBean1" and "globalBean2"; whereas, "*" would match all
66+
* defined interceptors. The matching interceptors get applied according to their
67+
* returned order value, if they implement the {@link org.springframework.core.Ordered}
68+
* interface.
6869
*
6970
* <p>Creates a JDK proxy when proxy interfaces are given, and a CGLIB proxy for the
7071
* actual target class if not. Note that the latter will only work if the target class
@@ -75,7 +76,7 @@
7576
* This won't work for existing prototype references, which are independent. However,
7677
* it will work for prototypes subsequently obtained from the factory. Changes to
7778
* interception will work immediately on singletons (including existing references).
78-
* However, to change interfaces or target it's necessary to obtain a new instance
79+
* However, to change interfaces or a target it's necessary to obtain a new instance
7980
* from the factory. This means that singleton instances obtained from the factory
8081
* do not have the same object identity. However, they do have the same interceptors
8182
* and target, and changing any reference will change all objects.

spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* (possibly shared or independent) when invoked.
2424
*
2525
* <p>This interface is typically used to encapsulate a generic factory which
26-
* returns a new instance (prototype) of some target objects on each invocation.
26+
* returns a new instance (prototype) of some target object on each invocation.
2727
*
2828
* <p>This interface is similar to {@link FactoryBean}, but implementations
2929
* of the latter are normally meant to be defined as SPI instances in a

0 commit comments

Comments
 (0)