Fix sonar findings (#3135)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2026-06-12 13:05:12 +03:00
committed by GitHub
parent aa79097c1f
commit 0ed056c7f1
8 changed files with 15 additions and 18 deletions

View File

@@ -12,6 +12,7 @@ package org.eclipse.hawkbit.ui.security;
import java.io.IOException;
import java.time.Instant;
import java.util.Collection;
import java.util.Objects;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
@@ -50,7 +51,9 @@ class UserDetailsSetter extends OncePerRequestFilter {
final Collection<? extends GrantedAuthority> grantedAuthorities = grantedAuthoritiesService.getGrantedAuthorities(authentication);
if (authentication instanceof OAuth2AuthenticationToken oAuth2AuthenticationToken) {
newAuthentication = new OAuth2AuthenticationToken(
oAuth2AuthenticationToken.getPrincipal(), grantedAuthorities,
// principal is not null, but the method is not @NonNull annotated
Objects.requireNonNull(oAuth2AuthenticationToken.getPrincipal()),
grantedAuthorities,
oAuth2AuthenticationToken.getAuthorizedClientRegistrationId());
if (authentication.getPrincipal() instanceof OidcUser user) {
// if there is no refresh token and the access token is expired then re-login is required