FooConfig, Foo, Bar, and BarFactory are now public static classes in order to avoid a bug with JDT/Spring IDE where the classes cannot be found in the XML application context.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3117 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="foo" class="org.springframework.context.annotation.Foo">
+	<bean id="foo" class="org.springframework.context.annotation.Spr6602Tests$Foo">
-		<constructor-arg ref="barFactory"/>
+		<constructor-arg ref="barFactory" />
 	</bean>
-	
+
-	<bean id="barFactory" class="org.springframework.context.annotation.BarFactory"/>
+	<bean id="barFactory" class="org.springframework.context.annotation.Spr6602Tests$BarFactory" />
 
 </beans>

org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java

@@ -36,58 +36,67 @@ public class Spr6602Tests {
 	public void testXmlBehavior() throws Exception {
 		doAssertions(new ClassPathXmlApplicationContext("Spr6602Tests-context.xml", Spr6602Tests.class));
 	}
-	
+
 	@Test
 	public void testConfigurationClassBehavior() throws Exception {
 		doAssertions(new AnnotationConfigApplicationContext(FooConfig.class));
 	}
-	
+
 	private void doAssertions(ApplicationContext ctx) throws Exception {
 		Foo foo = ctx.getBean(Foo.class);
-		
+
 		Bar bar1 = ctx.getBean(Bar.class);
 		Bar bar2 = ctx.getBean(Bar.class);
 		assertThat(bar1, is(bar2));
 		assertThat(bar1, is(foo.bar));
-		
+
 		BarFactory barFactory1 = ctx.getBean(BarFactory.class);
 		BarFactory barFactory2 = ctx.getBean(BarFactory.class);
 		assertThat(barFactory1, is(barFactory2));
-		
+
 		Bar bar3 = barFactory1.getObject();
 		Bar bar4 = barFactory1.getObject();
 		assertThat(bar3, is(not(bar4)));
 	}
-	
-}
 
+	@Configuration
+	public static class FooConfig {
+		@Bean
+		public Foo foo() throws Exception {
+			return new Foo(barFactory().getObject());
+		}
 
-@Configuration
+		@Bean
-class FooConfig {
+		public BarFactory barFactory() {
-	public @Bean Foo foo() throws Exception {
+			return new BarFactory();
-		return new Foo(barFactory().getObject());
+		}
-	}
-	
-	public @Bean BarFactory barFactory() {
-		return new BarFactory();
 	}
-}
 
-class Foo { final Bar bar; public Foo(Bar bar) { this.bar = bar; } }
+	public static class Foo {
-class Bar { }
+		final Bar bar;
 
-class BarFactory implements FactoryBean<Bar> {
+		public Foo(Bar bar) {
-
+			this.bar = bar;
-	public Bar getObject() throws Exception {
+		}
-		return new Bar();
 	}
 
-	public Class<? extends Bar> getObjectType() {
+	public static class Bar {
-		return Bar.class;
 	}
-	
+
-	public boolean isSingleton() {
+	public static class BarFactory implements FactoryBean<Bar> {
-		return true;
+
+		public Bar getObject() throws Exception {
+			return new Bar();
+		}
+
+		public Class<? extends Bar> getObjectType() {
+			return Bar.class;
+		}
+
+		public boolean isSingleton() {
+			return true;
+		}
+
 	}
 
-}
+}