Polishing

spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java

 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -49,14 +49,14 @@ public class EventPublicationInterceptorTests {
 		this.publisher = mock(ApplicationEventPublisher.class);
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testWithNoApplicationEventClassSupplied() throws Exception {
 		EventPublicationInterceptor interceptor = new EventPublicationInterceptor();
 		interceptor.setApplicationEventPublisher(this.publisher);
 		interceptor.afterPropertiesSet();
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testWithNonApplicationEventClassSupplied() throws Exception {
 		EventPublicationInterceptor interceptor = new EventPublicationInterceptor();
 		interceptor.setApplicationEventPublisher(this.publisher);
@@ -64,7 +64,7 @@ public class EventPublicationInterceptorTests {
 		interceptor.afterPropertiesSet();
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testWithAbstractStraightApplicationEventClassSupplied() throws Exception {
 		EventPublicationInterceptor interceptor = new EventPublicationInterceptor();
 		interceptor.setApplicationEventPublisher(this.publisher);
@@ -72,7 +72,7 @@ public class EventPublicationInterceptorTests {
 		interceptor.afterPropertiesSet();
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testWithApplicationEventClassThatDoesntExposeAValidCtor() throws Exception {
 		EventPublicationInterceptor interceptor = new EventPublicationInterceptor();
 		interceptor.setApplicationEventPublisher(this.publisher);
@@ -129,7 +129,7 @@ public class EventPublicationInterceptorTests {
 	public static class FactoryBeanTestListener extends TestListener implements FactoryBean<Object> {
 
 		@Override
-		public Object getObject() throws Exception {
+		public Object getObject() {
 			return "test";
 		}
 

spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java

@@ -35,10 +35,10 @@ public class PayloadApplicationEventTests {
 
 	@Test
 	public void testEventClassWithInterface() {
-		ApplicationContext ac = new AnnotationConfigApplicationContext(Listener.class);
-		MyEventClass event = new MyEventClass<>(this, "xyz");
+		ApplicationContext ac = new AnnotationConfigApplicationContext(AuditableListener.class);
+		AuditablePayloadEvent event = new AuditablePayloadEvent<>(this, "xyz");
 		ac.publishEvent(event);
-		assertTrue(ac.getBean(Listener.class).events.contains(event));
+		assertTrue(ac.getBean(AuditableListener.class).events.contains(event));
 	}
 
 
@@ -46,20 +46,17 @@ public class PayloadApplicationEventTests {
 	}
 
 
-	public static class MyEventClass<GT> extends PayloadApplicationEvent<GT> implements Auditable {
+	@SuppressWarnings("serial")
+	public static class AuditablePayloadEvent<T> extends PayloadApplicationEvent<T> implements Auditable {
 
-		public MyEventClass(Object source, GT payload) {
+		public AuditablePayloadEvent(Object source, T payload) {
 			super(source, payload);
 		}
-
-		public String toString() {
-			return "Payload: " + getPayload();
-		}
 	}
 
 
 	@Component
-	public static class Listener {
+	public static class AuditableListener {
 
 		public final List<Auditable> events = new ArrayList<>();