Sonar Fixes (5) (#2211)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticateSecurityTokenFilter.java

@@ -78,8 +78,8 @@ public class ControllerPreAuthenticateSecurityTokenFilter extends AbstractContro
             return controllerManagement.getByControllerId(securityToken.getControllerId());
         }, securityToken.getTenant());
 
-        return target.map(t -> new HeaderAuthentication(t.getControllerId(),
-                        systemSecurityContext.runAsSystemAsTenant(() -> t.getSecurityToken(), securityToken.getTenant())))
+        return target.map(t -> new HeaderAuthentication(
+                        t.getControllerId(), systemSecurityContext.runAsSystemAsTenant(t::getSecurityToken, securityToken.getTenant())))
                 .orElse(null);
     }
 

hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilter.java

@@ -105,8 +105,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilter extends AbstractCont
                         : securityToken.getControllerId());
 
         final List<String> knownHashes = splitMultiHashBySemicolon(authorityNameConfigurationValue);
-        return knownHashes.stream().map(hashItem -> new HeaderAuthentication(controllerId, hashItem))
-                .collect(Collectors.toSet());
+        return knownHashes.stream().map(hashItem -> new HeaderAuthentication(controllerId, hashItem)).collect(Collectors.toSet());
     }
 
     @Override
@@ -115,7 +114,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilter extends AbstractCont
     }
 
     private static List<String> splitMultiHashBySemicolon(final String knownIssuerHashes) {
-        return Arrays.stream(knownIssuerHashes.split("[;,]")).map(String::toLowerCase).collect(Collectors.toList());
+        return Arrays.stream(knownIssuerHashes.split("[;,]")).map(String::toLowerCase).toList();
     }
 
     /**

hawkbit-security/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownloadTest.java

@@ -24,13 +24,10 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
-/**
- *
- */
 @Feature("Unit Tests - Security")
 @Story("Exclude path aware shallow ETag filter")
 @ExtendWith(MockitoExtension.class)
-public class ControllerPreAuthenticatedAnonymousDownloadTest {
+class ControllerPreAuthenticatedAnonymousDownloadTest {
 
     private ControllerPreAuthenticatedAnonymousDownload underTest;
 
@@ -41,19 +38,19 @@ public class ControllerPreAuthenticatedAnonymousDownloadTest {
     private TenantAware tenantAwareMock;
 
     @BeforeEach
-    public void before() {
+    void before() {
         underTest = new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagementMock, tenantAwareMock,
                 new SystemSecurityContext(tenantAwareMock));
     }
 
     @Test
-    public void useCorrectTenantConfiguationKey() {
+    void useCorrectTenantConfiguationKey() {
         assertThat(underTest.getTenantConfigurationKey()).as("Should be using the correct tenant configuration key")
                 .isEqualTo(underTest.getTenantConfigurationKey());
     }
 
     @Test
-    public void successfulAuthenticationAdditionalAuthoritiesForDownload() {
+    void successfulAuthenticationAdditionalAuthoritiesForDownload() {
         assertThat(underTest.getSuccessfulAuthenticationAuthorities())
                 .as("Additional authorities should be containing the download anonymous role")
                 .contains(new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_ROLE));

hawkbit-security/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilterTest.java

@@ -33,7 +33,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 @Feature("Unit Tests - Security")
 @Story("Issuer hash based authentication")
 @ExtendWith(MockitoExtension.class)
-public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
+class ControllerPreAuthenticatedSecurityHeaderFilterTest {
 
     private static final String CA_COMMON_NAME = "ca-cn";
     private static final String CA_COMMON_NAME_VALUE = "box1";
@@ -63,7 +63,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
     private SecurityContextSerializer securityContextSerializer;
 
     @BeforeEach
-    public void before() {
+    void before() {
         final SecurityContextTenantAware tenantAware = new SecurityContextTenantAware(authoritiesResolver, securityContextSerializer);
         underTest = new ControllerPreAuthenticatedSecurityHeaderFilter(
                 CA_COMMON_NAME, "X-Ssl-Issuer-Hash-%d",
@@ -72,7 +72,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
 
     @Test
     @Description("Tests the filter for issuer hash based authentication with a single known hash")
-    public void testIssuerHashBasedAuthenticationWithSingleKnownHash() {
+    void testIssuerHashBasedAuthenticationWithSingleKnownHash() {
         final ControllerSecurityToken securityToken = prepareSecurityToken(SINGLE_HASH);
         // use single known hash
         when(tenantConfigurationManagementMock.getConfigurationValue(
@@ -83,7 +83,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
 
     @Test
     @Description("Tests the filter for issuer hash based authentication with multiple known hashes")
-    public void testIssuerHashBasedAuthenticationWithMultipleKnownHashes() {
+    void testIssuerHashBasedAuthenticationWithMultipleKnownHashes() {
         // use multiple known hashes
         when(tenantConfigurationManagementMock.getConfigurationValue(
                 TenantConfigurationKey.AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME, String.class))
@@ -95,7 +95,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
 
     @Test
     @Description("Tests the filter for issuer hash based authentication with unknown hash")
-    public void testIssuerHashBasedAuthenticationWithUnknownHash() {
+    void testIssuerHashBasedAuthenticationWithUnknownHash() {
         final ControllerSecurityToken securityToken = prepareSecurityToken(UNKNOWN_HASH);
         // use single known hash
         when(tenantConfigurationManagementMock.getConfigurationValue(
@@ -106,7 +106,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
 
     @Test
     @Description("Tests different values for issuer hash header and inspects the credentials")
-    public void useDifferentValuesForIssuerHashHeader() {
+    void useDifferentValuesForIssuerHashHeader() {
         final ControllerSecurityToken securityToken1 = prepareSecurityToken(SINGLE_HASH);
         final ControllerSecurityToken securityToken2 = prepareSecurityToken(SECOND_HASH);