root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Rossen Stoyanchev 2019-10-23 14:55:55 +01:00
parent f77d23de94
commit 739d2881fa
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,7 +25,7 @@ import org.springframework.messaging.handler.invocation.HandlerMethodArgumentRes
import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
/** /**
* {@link HandlerMethodArgumentResolver} to a {@link Principal} or {@link Optional} of {@link Principal}. * Resolver for arguments of type {@link Principal}, including {@code Optional<Principal>}.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 4.0 * @since 4.0
@ -42,11 +42,7 @@ public class PrincipalMethodArgumentResolver implements HandlerMethodArgumentRes
@Override @Override
public Object resolveArgument(MethodParameter parameter, Message<?> message){ public Object resolveArgument(MethodParameter parameter, Message<?> message){
Principal user = SimpMessageHeaderAccessor.getUser(message.getHeaders()); Principal user = SimpMessageHeaderAccessor.getUser(message.getHeaders());
if (parameter.isOptional()) { return parameter.isOptional() ? Optional.ofNullable(user) : user;
return Optional.ofNullable(user);
} else {
return user;
}
} }
} }