NOTE: {@code @Scope} annotations are only introspected on the + * concrete bean class (for annotated components) or the factory method + * (for {@code @Bean} methods). In contrast to XML bean definitions, + * there is no notion of bean definition inheritance, and inheritance + * hierarchies at the class level are irrelevant for metadata purposes. + * *
In this context, scope means the lifecycle of an instance,
* such as {@code singleton}, {@code prototype}, and so forth. Scopes
* provided out of the box in Spring may be referred to using the
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
index 35f767829c5..6543e365e24 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1452,9 +1452,19 @@ public class XmlBeanFactoryTests {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.loadBeanDefinitions(OVERRIDES_CONTEXT);
- TestBean jenny = (TestBean) xbf.getBean("jennyChild");
- assertEquals(1, jenny.getFriends().size());
- assertTrue(jenny.getFriends().iterator().next() instanceof TestBean);
+
+ TestBean jenny1 = (TestBean) xbf.getBean("jennyChild");
+ assertEquals(1, jenny1.getFriends().size());
+ Object friend1 = jenny1.getFriends().iterator().next();
+ assertTrue(friend1 instanceof TestBean);
+
+ TestBean jenny2 = (TestBean) xbf.getBean("jennyChild");
+ assertEquals(1, jenny2.getFriends().size());
+ Object friend2 = jenny2.getFriends().iterator().next();
+ assertTrue(friend2 instanceof TestBean);
+
+ assertNotSame(jenny1, jenny2);
+ assertNotSame(friend1, friend2);
}
@Test
diff --git a/src/asciidoc/core-beans.adoc b/src/asciidoc/core-beans.adoc
index 0f367cb7114..a2b044842de 100644
--- a/src/asciidoc/core-beans.adoc
+++ b/src/asciidoc/core-beans.adoc
@@ -306,23 +306,23 @@ Typically, such configuration will live in a ".groovy" file with a structure as
[source,java,indent=0]
[subs="verbatim,quotes"]
----
- beans {
- dataSource(BasicDataSource) {
- driverClassName = "org.hsqldb.jdbcDriver"
- url = "jdbc:hsqldb:mem:grailsDB"
- username = "sa"
- password = ""
- settings = [mynew:"setting"]
- }
- sessionFactory(SessionFactory) {
- dataSource = dataSource
- }
- myService(MyService) {
- nestedBean = { AnotherBean bean ->
- dataSource = dataSource
- }
- }
- }
+ beans {
+ dataSource(BasicDataSource) {
+ driverClassName = "org.hsqldb.jdbcDriver"
+ url = "jdbc:hsqldb:mem:grailsDB"
+ username = "sa"
+ password = ""
+ settings = [mynew:"setting"]
+ }
+ sessionFactory(SessionFactory) {
+ dataSource = dataSource
+ }
+ myService(MyService) {
+ nestedBean = { AnotherBean bean ->
+ dataSource = dataSource
+ }
+ }
+ }
----
This configuration style is largely equivalent to XML bean definitions and even
@@ -4469,17 +4469,17 @@ The same applies for typed collections:
====
Your target beans can implement the `org.springframework.core.Ordered` interface or use
the `@Order` or standard `@Priority` annotation if you want items in the array or list
-to be sorted into a specific order. Otherwise their order will follow the registration
+to be sorted in a specific order. Otherwise their order will follow the registration
order of the corresponding target bean definitions in the container.
The `@Order` annotation may be declared at target class level but also on `@Bean` methods,
potentially being very individual per bean definition (in case of multiple definitions
-with the same bean class). `@Order` values may influence priorities at injection points
+with the same bean class). `@Order` values may influence priorities at injection points,
but please be aware that they do not influence singleton startup order which is an
orthogonal concern determined by dependency relationships and `@DependsOn` declarations.
Note that the standard `javax.annotation.Priority` annotation is not available at the
-`@Bean` level since it cannot be declared on methods. Its semantics can be modelled
+`@Bean` level since it cannot be declared on methods. Its semantics can be modeled
through `@Order` values in combination with `@Primary` on a single bean per type.
====
@@ -5731,10 +5731,10 @@ Spring stereotype annotation (`@Component`, `@Repository`, `@Service`, and
`@Controller`) that contains a _name_ `value` will thereby provide that name to the
corresponding bean definition.
-If such an annotation contains no _name_ `value` or for any other detected component (such
-as those discovered by custom filters), the default bean name generator returns the
-uncapitalized non-qualified class name. For example, if the following two components
-were detected, the names would be `myMovieLister` and `movieFinderImpl`:
+If such an annotation contains no _name_ `value` or for any other detected component
+(such as those discovered by custom filters), the default bean name generator returns
+the uncapitalized non-qualified class name. For example, if the following component
+classes were detected, the names would be `myMovieLister` and `movieFinderImpl`:
[source,java,indent=0]
[subs="verbatim,quotes"]
@@ -5793,8 +5793,8 @@ auto-generated names are adequate whenever the container is responsible for wiri
As with Spring-managed components in general, the default and most common scope for
autodetected components is `singleton`. However, sometimes you need a different scope
-which can be specified via the `@Scope` annotation. Simply provide the name of the scope
-within the annotation:
+which can be specified via the `@Scope` annotation. Simply provide the name of the
+scope within the annotation:
[source,java,indent=0]
[subs="verbatim,quotes"]
@@ -5806,8 +5806,19 @@ within the annotation:
}
----
-For details on web-specific scopes, see <