Introduce @Role

As a mechanism for setting the 'role' hint on BeanDefinitions created
via component-scanning or @Bean methods.

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

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.role.ComponentWithRole;
+import org.springframework.context.annotation.role.ComponentWithoutRole;
+
+/**
+ * Tests the use of the @Role annotation on @Bean methods and
+ * @Component classes.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
+public class RoleAnnotationTests {
+
+	@Test
+	public void onBeanMethod() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class);
+		ctx.refresh();
+		assertThat("Expected bean to have ROLE_APPLICATION",
+				ctx.getBeanDefinition("foo").getRole(), is(BeanDefinition.ROLE_APPLICATION));
+		assertThat("Expected bean to have ROLE_INFRASTRUCTURE",
+				ctx.getBeanDefinition("bar").getRole(), is(BeanDefinition.ROLE_INFRASTRUCTURE));
+	}
+
+
+	@Configuration
+	static class Config {
+		@Bean
+		public String foo() {
+			return "foo";
+		}
+
+		@Bean
+		@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+		public String bar() {
+			return "bar";
+		}
+	}
+
+
+	@Test
+	public void onComponentClass() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(ComponentWithoutRole.class, ComponentWithRole.class);
+		ctx.refresh();
+		assertThat("Expected bean to have ROLE_APPLICATION",
+				ctx.getBeanDefinition("componentWithoutRole").getRole(), is(BeanDefinition.ROLE_APPLICATION));
+		assertThat("Expected bean to have ROLE_INFRASTRUCTURE",
+				ctx.getBeanDefinition("componentWithRole").getRole(), is(BeanDefinition.ROLE_INFRASTRUCTURE));
+	}
+
+
+	@Test
+	public void viaComponentScanning() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.scan("org.springframework.context.annotation.role");
+		ctx.refresh();
+		assertThat("Expected bean to have ROLE_APPLICATION",
+				ctx.getBeanDefinition("componentWithoutRole").getRole(), is(BeanDefinition.ROLE_APPLICATION));
+		assertThat("Expected bean to have ROLE_INFRASTRUCTURE",
+				ctx.getBeanDefinition("componentWithRole").getRole(), is(BeanDefinition.ROLE_INFRASTRUCTURE));
+	}
+}

org.springframework.context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.role;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
+import org.springframework.stereotype.Component;
+
+@Component("componentWithRole")
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+public class ComponentWithRole {
+}

org.springframework.context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.role;
+
+import org.springframework.stereotype.Component;
+
+@Component("componentWithoutRole")
+public class ComponentWithoutRole {
+}