From 739d2881faf7d98bfbf09cab3a5fae0f2e87497d Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 23 Oct 2019 14:55:55 +0100 Subject: [PATCH] Polishing --- .../support/PrincipalMethodArgumentResolver.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java index 859eaef433..6b9a013386 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java @@ -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"); * 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; /** - * {@link HandlerMethodArgumentResolver} to a {@link Principal} or {@link Optional} of {@link Principal}. + * Resolver for arguments of type {@link Principal}, including {@code Optional}. * * @author Rossen Stoyanchev * @since 4.0 @@ -42,11 +42,7 @@ public class PrincipalMethodArgumentResolver implements HandlerMethodArgumentRes @Override public Object resolveArgument(MethodParameter parameter, Message message){ Principal user = SimpMessageHeaderAccessor.getUser(message.getHeaders()); - if (parameter.isOptional()) { - return Optional.ofNullable(user); - } else { - return user; - } + return parameter.isOptional() ? Optional.ofNullable(user) : user; } }