From 117f2bf68329d6490f985ddb271afa68f2be4033 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Fri, 19 Sep 2025 16:01:57 +0300
Subject: [PATCH] Fix Sonar Findings (#2683)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .../jpa/JpaRepositoryConfiguration.java         |  2 +-
 .../eclipse/hawkbit/ui/simple/SimpleUIApp.java  | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java
index c0e6d0396..223ab77c5 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java
@@ -170,7 +170,7 @@ public class JpaRepositoryConfiguration {
     }
 
     @Bean
-    public static BeanPostProcessor entityManagerBeanPostProcessor(
+    public BeanPostProcessor entityManagerBeanPostProcessor(
             @Autowired(required = false) final AccessController<JpaArtifact> artifactAccessController,
             @Autowired(required = false) final AccessController<JpaSoftwareModuleType> softwareModuleTypeAccessController,
             @Autowired(required = false) final AccessController<JpaSoftwareModule> softwareModuleAccessController,
diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java
index afae3943a..aba4da1e5 100644
--- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java
+++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java
@@ -61,14 +61,15 @@ import static java.util.Collections.emptyList;
 @Import(FeignClientsConfiguration.class)
 public class SimpleUIApp implements AppShellConfigurator {
 
+    private static final String AUTHORIZATION_HEADER = "Authorization";
     private static final Function<OAuth2TokenManager, RequestInterceptor> AUTHORIZATION = oAuth2TokenManager -> requestTemplate -> {
         final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication instanceof OAuth2AuthenticationToken authenticationToken) {
             String bearerToken = oAuth2TokenManager.getToken(authenticationToken);
-            requestTemplate.header("Authorization", "Bearer " + bearerToken);
+            requestTemplate.header(AUTHORIZATION_HEADER, "Bearer " + bearerToken);
         } else {
             requestTemplate.header(
-                    "Authorization", "Basic " + Base64.getEncoder().encodeToString(
+                    AUTHORIZATION_HEADER, "Basic " + Base64.getEncoder().encodeToString(
                             (Objects.requireNonNull(authentication.getPrincipal(), "User is null!") + ":" + Objects.requireNonNull(
                                     authentication.getCredentials(), "Password is not available!")).getBytes(ISO_8859_1))
             );
@@ -113,7 +114,7 @@ public class SimpleUIApp implements AppShellConfigurator {
     @Bean
     OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService(final HawkbitMgmtClient hawkbitClient) {
         final OidcUserService delegate = new OidcUserService();
-        return (userRequest) -> {
+        return userRequest -> {
             OidcUser oidcUser = delegate.loadUser(userRequest);
             final OAuth2AuthenticationToken tempToken = new OAuth2AuthenticationToken(
                     oidcUser,
@@ -121,11 +122,7 @@ public class SimpleUIApp implements AppShellConfigurator {
                     userRequest.getClientRegistration().getRegistrationId()
             );
             final List<SimpleGrantedAuthority> grantedAuthorities = getGrantedAuthorities(hawkbitClient, tempToken);
-            return new DefaultOidcUser(
-                    grantedAuthorities,
-                    oidcUser.getIdToken(),
-                    oidcUser.getUserInfo()
-            );
+            return new DefaultOidcUser(grantedAuthorities, oidcUser.getIdToken(), oidcUser.getUserInfo());
         };
     }
 
@@ -191,7 +188,7 @@ public class SimpleUIApp implements AppShellConfigurator {
 
             final String auth = username + ":" + password;
             final String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
-            conn.setRequestProperty("Authorization", "Basic " + encodedAuth);
+            conn.setRequestProperty(AUTHORIZATION_HEADER, "Basic " + encodedAuth);
 
             return conn.getResponseCode() != 401;
         } catch (final Exception ex) {
@@ -199,4 +196,4 @@ public class SimpleUIApp implements AppShellConfigurator {
             return false;
         }
     }
-}
+}
\ No newline at end of file