[PPANTT-215] resolve sonar issue

src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/AsyncNotificationService.java

@@ -67,10 +67,7 @@ private Context buildEmailHtmlBodyContext(String bundleName, String pspName) {
         Map<String, Object> properties = new HashMap<>();
         properties.put("bundleName", bundleName);
         properties.put("environment", getEnvParam());
-
-        if (pspName != null) {
-            properties.put("pspName", pspName);
-        }
+        properties.put("pspName", pspName);
 
         context.setVariables(properties);
         return context;

src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/CommissionBundleService.java

@@ -642,17 +642,14 @@ public byte[] exportPSPBundleList(String pspTaxCode, List<BundleType> bundleType
         return this.exportService.exportPSPBundlesToCsv(pspCode, bundleTypeList);
     }
 
-    private Context buildEmailHtmlBodyContext(String bundleName, String pspName) {
+    private Context buildEmailHtmlBodyContext(String bundleName) {
         // Thymeleaf Context
         Context context = new Context();
 
         // Properties to show up in Template after stored in Context
         Map<String, Object> properties = new HashMap<>();
         properties.put("bundleName", bundleName);
         properties.put("environment", getEnvParam());
-        if (pspName != null) {
-            properties.put("pspName", pspName);
-        }
 
         context.setVariables(properties);
         return context;
@@ -665,10 +662,6 @@ private String getEnvParam() {
         return String.format(".%s", this.environment.toLowerCase());
     }
 
-    private Context buildEmailHtmlBodyContext(String bundleName) {
-        return buildEmailHtmlBodyContext(bundleName, null);
-    }
-
     private List<CISubscriptionInfo> buildCISubscriptionInfoList(
             List<CreditorInstitutionInfo> ciInfoList,
             BundleCreditorInstitutionResource acceptedSubscription

src/test/java/it/pagopa/selfcare/pagopa/backoffice/client/AwsSesClientTest.java

@@ -49,6 +49,7 @@ class AwsSesClientTest {
     @Test
     void sendEmailPRODSuccess() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", true);
+        ReflectionTestUtils.setField(sut, "environment", "PROD");
 
         Institutions institutions = buildInstitutions();
         List<InstitutionProductUsers> institutionProductUsers = buildInstitutionProductUsers();
@@ -69,6 +70,7 @@ void sendEmailPRODSuccess() {
     @Test
     void sendEmailNotPRODSuccess() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", false);
+        ReflectionTestUtils.setField(sut, "environment", "UAT");
 
         when(templateEngine.process(anyString(), any())).thenReturn("html template");
         when(sesClient.sendEmail(any(SendEmailRequest.class))).thenReturn(SendEmailResponse.builder().build());
@@ -87,6 +89,7 @@ void sendEmailNotPRODSuccess() {
     @Test
     void sendEmailPRODFail() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", true);
+        ReflectionTestUtils.setField(sut, "environment", "PROD");
 
         Institutions institutions = buildInstitutions();
         List<InstitutionProductUsers> institutionProductUsers = buildInstitutionProductUsers();
@@ -108,6 +111,7 @@ void sendEmailPRODFail() {
     void sendEmailPRODNoInstitutionTaxCodeSkipped() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", true);
         ReflectionTestUtils.setField(sut, "testEmailAddress", "[email protected]");
+        ReflectionTestUtils.setField(sut, "environment", "PROD");
 
         assertDoesNotThrow(() -> sut.sendEmail(buildEmailMessageDetail(null)));
 
@@ -125,6 +129,7 @@ void sendEmailPRODNoInstitutionTaxCodeSkipped() {
     @Test
     void sendEmailNoInstitutionFoundSkipped() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", true);
+        ReflectionTestUtils.setField(sut, "environment", "PROD");
 
         when(externalApiClient.getInstitutionsFiltered(INSTITUTION_TAX_CODE))
                 .thenReturn(Institutions.builder().institutions(Collections.emptyList()).build());
@@ -144,6 +149,7 @@ void sendEmailNoInstitutionFoundSkipped() {
     @Test
     void sendEmailNoDestinationSkipped() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", true);
+        ReflectionTestUtils.setField(sut, "environment", "PROD");
 
         Institutions institutions = buildInstitutions();
 
@@ -165,6 +171,7 @@ void sendEmailNoDestinationSkipped() {
     void sendEmailNotPRODAndNoTestEmailSkipped() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", false);
         ReflectionTestUtils.setField(sut, "testEmailAddress", null);
+        ReflectionTestUtils.setField(sut, "environment", "UAT");
 
         assertDoesNotThrow(() -> sut.sendEmail(buildEmailMessageDetail(INSTITUTION_TAX_CODE)));
 
@@ -182,6 +189,7 @@ void sendEmailNotPRODAndNoTestEmailSkipped() {
     @Test
     void sendEmailPRODSWithPagopaOperatorSuccess() {
         ReflectionTestUtils.setField(sut, "enableSendEmail", true);
+        ReflectionTestUtils.setField(sut, "environment", "PROD");
 
         Institutions institutions = buildInstitutions();
         List<InstitutionProductUsers> institutionProductUsers = buildInstitutionProductUsers();