Polishing

Author: jhoeller

spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java

@@ -302,7 +302,7 @@ private void assertTargetBean(Method method, Object targetBean, Object[] args) {
 		Class<?> targetBeanClass = targetBean.getClass();
 		if (!methodDeclaringClass.isAssignableFrom(targetBeanClass)) {
 			String msg = "The event listener method class '" + methodDeclaringClass.getName() +
-					"' is not an instance of the actual bean instance '" +
+					"' is not an instance of the actual bean class '" +
 					targetBeanClass.getName() + "'. If the bean requires proxying " +
 					"(e.g. due to @Transactional), please use class-based proxying.";
 			throw new IllegalStateException(getInvocationErrorMessage(targetBean, msg, args));

spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java

@@ -391,12 +391,10 @@ public static AnnotationAttributes getMergedAnnotationAttributes(AnnotatedElemen
 	 * the result back into an annotation of the specified {@code annotationType}.
 	 * <p>{@link AliasFor @AliasFor} semantics are fully supported, both
 	 * within a single annotation and within the annotation hierarchy.
-	 * <p>This method delegates to {@link #findMergedAnnotation(AnnotatedElement, String)}.
 	 * @param element the annotated element
 	 * @param annotationType the annotation type to find
 	 * @return the merged, synthesized {@code Annotation}, or {@code null} if not found
 	 * @since 4.2
-	 * @see #findMergedAnnotation(AnnotatedElement, String)
 	 * @see #findMergedAnnotationAttributes(AnnotatedElement, String, boolean, boolean)
 	 * @see #getMergedAnnotationAttributes(AnnotatedElement, Class)
 	 */

spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java

@@ -52,6 +52,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
 	@Rule
 	public final ExpectedException thrown = ExpectedException.none();
 
+
 	@Test
 	public abstract void sampleConfiguration();
 
@@ -79,6 +80,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
 	@Test
 	public abstract void jmsListeners();
 
+
 	/**
 	 * Test for {@link SampleBean} discovery. If a factory with the default name
 	 * is set, an endpoint will use it automatically
@@ -92,18 +94,6 @@ public void testSampleConfiguration(ApplicationContext context) {
 		assertEquals(1, simpleFactory.getListenerContainers().size());
 	}
 
-	@Component
-	static class SampleBean {
-
-		@JmsListener(destination = "myQueue")
-		public void defaultHandle(String msg) {
-		}
-
-		@JmsListener(containerFactory = "simpleFactory", destination = "myQueue")
-		public void simpleHandle(String msg) {
-		}
-	}
-
 	/**
 	 * Test for {@link FullBean} discovery. In this case, no default is set because
 	 * all endpoints provide a default registry. This shows that the default factory
@@ -127,29 +117,6 @@ public void testFullConfiguration(ApplicationContext context) {
 		assertEquals("queueOut", destination);
 	}
 
-	@Component
-	static class FullBean {
-
-		@JmsListener(id = "listener1", containerFactory = "simpleFactory", destination = "queueIn",
-				selector = "mySelector", subscription = "mySubscription", concurrency = "1-10")
-		@SendTo("queueOut")
-		public String fullHandle(String msg) {
-			return "reply";
-		}
-	}
-
-	@Component
-	static class FullConfigurableBean {
-
-		@JmsListener(id = "${jms.listener.id}", containerFactory = "${jms.listener.containerFactory}",
-				destination = "${jms.listener.destination}", selector = "${jms.listener.selector}",
-				subscription = "${jms.listener.subscription}", concurrency = "${jms.listener.concurrency}")
-		@SendTo("${jms.listener.sendTo}")
-		public String fullHandle(String msg) {
-			return "reply";
-		}
-	}
-
 	/**
 	 * Test for {@link CustomBean} and an manually endpoint registered
 	 * with "myCustomEndpointId". The custom endpoint does not provide
@@ -179,14 +146,6 @@ public void testCustomConfiguration(ApplicationContext context) {
 				customRegistry.getListenerContainer("myCustomEndpointId"));
 	}
 
-	@Component
-	static class CustomBean {
-
-		@JmsListener(id = "listenerId", containerFactory = "customFactory", destination = "myQueue")
-		public void customHandle(String msg) {
-		}
-	}
-
 	/**
 	 * Test for {@link DefaultBean} that does not define the container
 	 * factory to use as a default is registered with an explicit
@@ -208,13 +167,6 @@ public void testDefaultContainerFactoryConfiguration(ApplicationContext context)
 		assertEquals(1, defaultFactory.getListenerContainers().size());
 	}
 
-	static class DefaultBean {
-
-		@JmsListener(destination = "myQueue")
-		public void handleIt(String msg) {
-		}
-	}
-
 	/**
 	 * Test for {@link ValidationBean} with a validator ({@link TestValidator}) specified
 	 * in a custom {@link org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory}.
@@ -234,14 +186,6 @@ public void testJmsHandlerMethodFactoryConfiguration(ApplicationContext context)
 		listener.onMessage(new StubTextMessage("failValidation"), mock(Session.class));
 	}
 
-	@Component
-	static class ValidationBean {
-
-		@JmsListener(containerFactory = "defaultFactory", destination = "myQueue")
-		public void defaultHandle(@Validated String msg) {
-		}
-	}
-
 	/**
 	 * Test for {@link JmsListenerRepeatableBean} and {@link JmsListenersBean} that validates that the
 	 * {@code @JmsListener} annotation is repeatable and generate one specific container per annotation.
@@ -264,16 +208,81 @@ public void testJmsListenerRepeatable(ApplicationContext context) {
 		assertEquals("2-10", second.getConcurrency());
 	}
 
+
+	@Component
+	static class SampleBean {
+
+		@JmsListener(destination = "myQueue")
+		public void defaultHandle(String msg) {
+		}
+
+		@JmsListener(containerFactory = "simpleFactory", destination = "myQueue")
+		public void simpleHandle(String msg) {
+		}
+	}
+
+
+	@Component
+	static class FullBean {
+
+		@JmsListener(id = "listener1", containerFactory = "simpleFactory", destination = "queueIn",
+				selector = "mySelector", subscription = "mySubscription", concurrency = "1-10")
+		@SendTo("queueOut")
+		public String fullHandle(String msg) {
+			return "reply";
+		}
+	}
+
+
+	@Component
+	static class FullConfigurableBean {
+
+		@JmsListener(id = "${jms.listener.id}", containerFactory = "${jms.listener.containerFactory}",
+				destination = "${jms.listener.destination}", selector = "${jms.listener.selector}",
+				subscription = "${jms.listener.subscription}", concurrency = "${jms.listener.concurrency}")
+		@SendTo("${jms.listener.sendTo}")
+		public String fullHandle(String msg) {
+			return "reply";
+		}
+	}
+
+
+	@Component
+	static class CustomBean {
+
+		@JmsListener(id = "listenerId", containerFactory = "customFactory", destination = "myQueue")
+		public void customHandle(String msg) {
+		}
+	}
+
+
+	static class DefaultBean {
+
+		@JmsListener(destination = "myQueue")
+		public void handleIt(String msg) {
+		}
+	}
+
+
+	@Component
+	static class ValidationBean {
+
+		@JmsListener(containerFactory = "defaultFactory", destination = "myQueue")
+		public void defaultHandle(@Validated String msg) {
+		}
+	}
+
+
 	@Component
 	static class JmsListenerRepeatableBean {
 
 		@JmsListener(id = "first", destination = "myQueue")
 		@JmsListener(id = "second", destination = "anotherQueue", concurrency = "2-10")
 		public void repeatableHandle(String msg) {
 		}
-
 	}
 
+
 	@Component
 	static class JmsListenersBean {
 
@@ -283,9 +292,9 @@ static class JmsListenersBean {
 		})
 		public void repeatableHandle(String msg) {
 		}
-
 	}
 
+
 	static class TestValidator implements Validator {
 
 		@Override
@@ -301,4 +310,5 @@ public void validate(Object target, Errors errors) {
 			}
 		}
 	}
+
 }

spring-jms/src/test/java/org/springframework/jms/annotation/AnnotationDrivenNamespaceTests.java

@@ -30,7 +30,6 @@
 import org.springframework.messaging.handler.annotation.support.MethodArgumentNotValidException;
 
 /**
- *
  * @author Stephane Nicoll
  */
 public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenTests {
@@ -75,13 +74,15 @@ public void explicitContainerFactory() {
 	}
 
 	@Override
+	@Test
 	public void defaultContainerFactory() {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"annotation-driven-default-container-factory.xml", getClass());
 		testDefaultContainerFactoryConfiguration(context);
 	}
 
 	@Override
+	@Test
 	public void jmsHandlerMethodFactoryConfiguration() throws JMSException {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"annotation-driven-custom-handler-method-factory.xml", getClass());
@@ -92,19 +93,22 @@ public void jmsHandlerMethodFactoryConfiguration() throws JMSException {
 	}
 
 	@Override
+	@Test
 	public void jmsListenerIsRepeatable() {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"annotation-driven-jms-listener-repeatable.xml", getClass());
 		testJmsListenerRepeatable(context);
 	}
 
 	@Override
+	@Test
 	public void jmsListeners() {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"annotation-driven-jms-listeners.xml", getClass());
 		testJmsListenerRepeatable(context);
 	}
 
+
 	static class CustomJmsListenerConfigurer implements JmsListenerConfigurer {
 
 		private MessageListener messageListener;
@@ -121,6 +125,6 @@ public void configureJmsListeners(JmsListenerEndpointRegistrar registrar) {
 		public void setMessageListener(MessageListener messageListener) {
 			this.messageListener = messageListener;
 		}
-
 	}
+
 }

spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java

@@ -54,6 +54,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
 	@Rule
 	public final ExpectedException thrown = ExpectedException.none();
 
+
 	@Override
 	@Test
 	public void sampleConfiguration() {
@@ -113,13 +114,15 @@ public void jmsHandlerMethodFactoryConfiguration() throws JMSException {
 	}
 
 	@Override
+	@Test
 	public void jmsListenerIsRepeatable() {
 		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
 				EnableJmsDefaultContainerFactoryConfig.class, JmsListenerRepeatableBean.class);
 		testJmsListenerRepeatable(context);
 	}
 
 	@Override
+	@Test
 	public void jmsListeners() {
 		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
 				EnableJmsDefaultContainerFactoryConfig.class, JmsListenersBean.class);
@@ -150,6 +153,7 @@ public void lazyComponent() {
 		assertTrue("Should have been stopped " + container, container.isStopped());
 	}
 
+
 	@EnableJms
 	@Configuration
 	static class EnableJmsSampleConfig {
@@ -165,6 +169,7 @@ public JmsListenerContainerTestFactory simpleFactory() {
 		}
 	}
 
+
 	@EnableJms
 	@Configuration
 	static class EnableJmsFullConfig {
@@ -175,6 +180,7 @@ public JmsListenerContainerTestFactory simpleFactory() {
 		}
 	}
 
+
 	@EnableJms
 	@Configuration
 	@PropertySource("classpath:/org/springframework/jms/annotation/jms-listener.properties")
@@ -191,6 +197,7 @@ public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer
 		}
 	}
 
+
 	@Configuration
 	@EnableJms
 	static class EnableJmsCustomConfig implements JmsListenerConfigurer {
@@ -228,6 +235,7 @@ public MessageListener simpleMessageListener() {
 		}
 	}
 
+
 	@Configuration
 	@EnableJms
 	static class EnableJmsCustomContainerFactoryConfig implements JmsListenerConfigurer {
@@ -243,6 +251,7 @@ public JmsListenerContainerTestFactory simpleFactory() {
 		}
 	}
 
+
 	@Configuration
 	@EnableJms
 	static class EnableJmsDefaultContainerFactoryConfig {
@@ -253,6 +262,7 @@ public JmsListenerContainerTestFactory jmsListenerContainerFactory() {
 		}
 	}
 
+
 	@Configuration
 	@EnableJms
 	static class EnableJmsHandlerMethodFactoryConfig implements JmsListenerConfigurer {
@@ -275,6 +285,7 @@ public JmsListenerContainerTestFactory defaultFactory() {
 		}
 	}
 
+
 	@Component
 	@Lazy
 	static class LazyBean {