Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add support for explicit generic type in PayloadApplicationEvent"

Browse Source 
See gh-24599
This commit is contained in:
Stephane Nicoll
2021-12-02 10:10:38 +01:00
parent 6283456ef2
commit 792b366bda
3 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
View File

@@ -39,17 +39,7 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
private final T payload;
@Nullable
private ResolvableType payloadType;
/**
* Create a new PayloadApplicationEvent.
* @param source the object on which the event initially occurred (never {@code null})
* @param payload the payload object (never {@code null})
*/
public PayloadApplicationEvent(Object source, T payload) {
this(source, payload, null);
}
private final ResolvableType payloadType;
/**
* Create a new PayloadApplicationEvent.
@@ -61,15 +51,21 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
super(source);
Assert.notNull(payload, "Payload must not be null");
this.payload = payload;
this.payloadType = payloadType;
this.payloadType = (payloadType != null) ? payloadType : ResolvableType.forInstance(payload);
}
/**
* Create a new PayloadApplicationEvent, using the instance to infer its type.
* @param source the object on which the event initially occurred (never {@code null})
* @param payload the payload object (never {@code null})
*/
public PayloadApplicationEvent(Object source, T payload) {
this(source, payload, null);
}
@Override
public ResolvableType getResolvableType() {
if (this.payloadType == null) {
this.payloadType = ResolvableType.forInstance(getPayload());
}
return ResolvableType.forClassWithGenerics(getClass(), this.payloadType);
}