fix: Sonar cloud issues fix (#16)

Author: Vitolo-Andrea

.github/workflows/code-review.yml

@@ -1,6 +1,9 @@
 name: SonarCloud Analysis
 
 on:
+  push:
+    branches:
+      - main
   pull_request:
     types:
       - opened

src/main/java/it/gov/pagopa/message/core/dto/CitizenConsentDTO.java

@@ -1,7 +1,6 @@
 package it.gov.pagopa.message.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -10,7 +9,6 @@
 
 @Data
 @SuperBuilder
-@AllArgsConstructor
 @NoArgsConstructor
 public class CitizenConsentDTO {
     @JsonAlias("fiscalCode")

src/test/java/it/gov/pagopa/common/utils/UtilsTest.java

@@ -21,15 +21,16 @@ class UtilsTest {
 
 
     @Test
-    void createSHA256_Ko_NoSuchAlgorithm() throws NoSuchAlgorithmException {
+    void createSHA256_Ko_NoSuchAlgorithm() {
         try (MockedStatic<MessageDigest> mockedStatic = Mockito.mockStatic(MessageDigest.class)) {
             mockedStatic.when(() -> MessageDigest.getInstance(any()))
-                    .thenThrow(NoSuchAlgorithmException.class);
+                    .thenThrow(new NoSuchAlgorithmException("SHA-256 not available"));
 
             EmdEncryptionException exception = assertThrows(EmdEncryptionException.class, () -> Utils.createSHA256(""));
+
+            assertEquals("SHA-256 not available", exception.getCause().getMessage());
         }
     }
-
     @Test
     void  createSHA256_Ok(){
         String toHash = "RSSMRA98B18L049O";

src/test/java/it/gov/pagopa/common/web/exception/ValidationExceptionHandlerTest.java

@@ -59,7 +59,7 @@ static class ValidationDTO {
         private String data;
     }
 
-    private final ValidationDTO VALIDATION_DTO = new ValidationDTO("data");
+    private final ValidationDTO validationDTO = new ValidationDTO("data");
 
     @Test
     void handleMethodArgumentNotValidException() throws Exception {
@@ -79,7 +79,7 @@ void handleMissingRequestHeaderException() throws Exception {
 
         mockMvc.perform(MockMvcRequestBuilders.put("/test")
                         .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(VALIDATION_DTO))
+                        .content(objectMapper.writeValueAsString(validationDTO))
                         .accept(MediaType.APPLICATION_JSON))
                 .andExpect(MockMvcResultMatchers.status().isBadRequest())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("INVALID_REQUEST"))

src/test/java/it/gov/pagopa/message/core/event/producer/MessageErrorProducerTest.java

@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -31,8 +30,6 @@ class MessageErrorProducerTest {
     private ScheduledExecutorService scheduler;
     @InjectMocks
     private MessageErrorProducer messageErrorProducer;
-    @Captor
-    private ArgumentCaptor<Runnable> runnableCaptor;
 
     @Test
      void testStreamBridgeSendCalled() throws Exception {
@@ -51,14 +48,11 @@ void testStreamBridgeSendCalled() throws Exception {
         ArgumentCaptor<Callable<Object>> runnableCaptor = ArgumentCaptor.forClass(Callable.class);
         when(scheduler.schedule(runnableCaptor.capture(), eq(5L), eq(TimeUnit.SECONDS))).thenReturn(null);
 
-        // Act
         messageErrorProducer.sendToMessageErrorQueue(message);
 
-        // Run the captured Runnable immediately
         Callable<Object> capturedRunnable = runnableCaptor.getValue();
         capturedRunnable.call();
 
-        // Assert
         verify(scheduler).schedule(any(Callable.class), eq(5L), eq(TimeUnit.SECONDS));
         verify(streamBridge, times(1)).send(eq("messageSender-out-0"), any(), eq(message));
 

src/test/java/it/gov/pagopa/message/core/service/CitizenServiceTest.java

@@ -63,7 +63,8 @@ void createCitizenConsent_Ko_EmdEncryptError(){
             mockedStatic.when(() -> Utils.createSHA256(any()))
                     .thenThrow(EmdEncryptionException.class);
 
-            EmdEncryptionException exception = assertThrows(EmdEncryptionException.class, () -> citizenService.createCitizenConsent(citizenConsentDTO));
+            assertThrows(EmdEncryptionException.class, () -> citizenService.createCitizenConsent(citizenConsentDTO));
+
         }
     }
 
@@ -83,26 +84,14 @@ void deleteCitizenConsent_Ok(){
     @Test
     void deleteCitizenConsent_Ko_UserNotOnboarded(){
         CitizenConsentDTO citizenConsentDTO = CitizenConsentDTOFaker.mockInstance(false);
-
+        String hashedFiscalCode = citizenConsentDTO.getHashedFiscalCode();
+        String channelId = citizenConsentDTO.getChannelId();
         Mockito.when(citizenRepository
                     .findByHashedFiscalCodeAndChannelId(Utils.createSHA256(citizenConsentDTO.getHashedFiscalCode()),citizenConsentDTO.getChannelId()))
                         .thenReturn(null);
 
         assertThrows(UserNotOnboardedException.class, () ->
-                citizenService.deleteCitizenConsent(citizenConsentDTO.getHashedFiscalCode(),citizenConsentDTO.getChannelId()));
-    }
-
-    @Test
-    void deleteCitizenConsent_Ko_EmdEncryptError(){
-        CitizenConsentDTO citizenConsentDTO = CitizenConsentDTOFaker.mockInstance(true);
-
-        try (MockedStatic<Utils> mockedStatic = Mockito.mockStatic(Utils.class)) {
-            mockedStatic.when(() -> Utils.createSHA256(any()))
-                    .thenThrow(EmdEncryptionException.class);
-
-            assertThrows(EmdEncryptionException.class, () ->
-                    citizenService.deleteCitizenConsent(citizenConsentDTO.getHashedFiscalCode(),citizenConsentDTO.getChannelId()));
-        }
+                citizenService.deleteCitizenConsent(hashedFiscalCode,channelId));
     }
 
     @Test
@@ -118,27 +107,33 @@ void updateCitizenConsent_Ok(){
     }
 
     @Test
-    void updateCitizenConsent_Ko_UserNotOnboarded(){
+    void updateCitizenConsent_Ko_UserNotOnboarded() {
+
         CitizenConsentDTO citizenConsentDTO = CitizenConsentDTOFaker.mockInstance(true);
 
-        Mockito.when(citizenRepository
-                    .findByHashedFiscalCodeAndChannelId(Utils.createSHA256(citizenConsentDTO.getHashedFiscalCode()),citizenConsentDTO.getChannelId()))
-                        .thenReturn(null);
+        String hashedFiscalCode = citizenConsentDTO.getHashedFiscalCode();
+        String channelId = citizenConsentDTO.getChannelId();
 
-        assertThrows(UserNotOnboardedException.class, () ->
-                citizenService.updateCitizenConsent(citizenConsentDTO.getHashedFiscalCode(),citizenConsentDTO.getChannelId()));
+        Mockito.when(citizenRepository.findByHashedFiscalCodeAndChannelId(hashedFiscalCode, channelId))
+                .thenReturn(null);
+
+        assertThrows(UserNotOnboardedException.class, () -> {
+            citizenService.updateCitizenConsent(hashedFiscalCode, channelId);
+        });
     }
 
     @Test
-    void updateCitizenConsent_Ko_EmdEncryptError(){
+    void citizenConsent_Ko_EmdEncryptError(){
         CitizenConsentDTO citizenConsentDTO = CitizenConsentDTOFaker.mockInstance(true);
+        String hashedFiscalCode = citizenConsentDTO.getHashedFiscalCode();
+        String channelId = citizenConsentDTO.getChannelId();
 
         try (MockedStatic<Utils> mockedStatic = Mockito.mockStatic(Utils.class)) {
             mockedStatic.when(() -> Utils.createSHA256(any()))
                     .thenThrow(EmdEncryptionException.class);
 
            assertThrows(EmdEncryptionException.class, () ->
-                    citizenService.deleteCitizenConsent(citizenConsentDTO.getHashedFiscalCode(),citizenConsentDTO.getChannelId()));
+                    citizenService.deleteCitizenConsent(hashedFiscalCode, channelId));
         }
     }
 }