QA-5470: develop merge finalization

pagopa · Feb 20, 2025 · ae4069e · ae4069e
1 parent e0fe3be
commit ae4069e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/...op-qa-tests/src/main/java/it/pagopa/interop/tenant/service/impl/TenantsApiClientImpl.java b/...op-qa-tests/src/main/java/it/pagopa/interop/tenant/service/impl/TenantsApiClientImpl.java
@@ -16,8 +16,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.UUID;
-
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class TenantsApiClientImpl implements ITenantsApi {

diff --git a/...sts/src/test/java/it/pagopa/pn/interop/cucumber/steps/agreement/AgreementCommonSteps.java b/...sts/src/test/java/it/pagopa/pn/interop/cucumber/steps/agreement/AgreementCommonSteps.java
@@ -16,7 +16,7 @@
 import it.pagopa.pn.interop.cucumber.steps.DataPreparationService;
 import it.pagopa.pn.interop.cucumber.steps.SharedStepsContext;
 import it.pagopa.pn.interop.cucumber.steps.common.EServicesCommonContext;
-import it.pagopa.pn.interop.cucumber.steps.delegate.DelegationCreateStep.DelegationRole;
+import it.pagopa.pn.interop.cucumber.steps.delegate.DelegationRole;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;

diff --git a/...sts/src/test/java/it/pagopa/pn/interop/cucumber/steps/authorization/ClientCreateStep.java b/...sts/src/test/java/it/pagopa/pn/interop/cucumber/steps/authorization/ClientCreateStep.java
@@ -8,7 +8,7 @@
 import it.pagopa.interop.utils.HttpCallExecutor;
 import it.pagopa.pn.interop.cucumber.steps.ClientTokenConfigurator;
 import it.pagopa.pn.interop.cucumber.steps.SharedStepsContext;
-import it.pagopa.pn.interop.cucumber.steps.delegate.DelegationCreateStep.DelegationRole;
+import it.pagopa.pn.interop.cucumber.steps.delegate.DelegationRole;
 import java.util.List;
 import java.util.Random;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ests/src/test/java/it/pagopa/pn/interop/cucumber/steps/delegate/DelegationAcceptStep.java b/...ests/src/test/java/it/pagopa/pn/interop/cucumber/steps/delegate/DelegationAcceptStep.java
@@ -10,7 +10,6 @@
 import it.pagopa.interop.utils.HttpCallExecutor;
 import it.pagopa.pn.interop.cucumber.steps.ClientTokenConfigurator;
 import it.pagopa.pn.interop.cucumber.steps.SharedStepsContext;
-import it.pagopa.pn.interop.cucumber.steps.delegate.DelegationCreateStep.DelegationRole;
 import org.springframework.http.HttpStatus;
 
 public class DelegationAcceptStep {

diff --git a/src/test/java/it/pagopa/pn/cucumber/steps/pa/AsyncSteps.java b/src/test/java/it/pagopa/pn/cucumber/steps/pa/AsyncSteps.java
@@ -35,7 +35,7 @@ public class AsyncSteps {
     private final PnPaymentInfoClientImpl pnPaymentInfoClientImpl;
     private final List<PaymentPositionModel> paymentPositionModel;
     private List<BffPaymentInfoItem> paymentInfoResponse;
-    private String deleteGDPresponse;
+    private String deleteGdpResponse;
     private Integer amountGPD;
     private final List<Integer> amountNotifica;
     private static final Integer NUM_CHECK_PAYMENT_INFO = 32;

diff --git a/src/test/java/it/pagopa/pn/cucumber/steps/pa/AvanzamentoNotificheWebhookB2bSteps.java b/src/test/java/it/pagopa/pn/cucumber/steps/pa/AvanzamentoNotificheWebhookB2bSteps.java
@@ -1706,7 +1706,7 @@ private <T> ProgressResponseElementV26 searchInWebhookV26(T timeLineOrStatus, St
     }
 
     private <T> ProgressResponseElement searchInWebhookFileNotFound(T timeLineOrStatus, String lastEventId, int deepCount) {
-        if(!(timeLineOrStatus instanceof TimelineElementCategoryV23) && (!(timeLineOrStatus instanceof NotificationStatus)) {
+        if(!(timeLineOrStatus instanceof TimelineElementCategoryV23) && (!(timeLineOrStatus instanceof NotificationStatus))) {
             throw new IllegalArgumentException();
         }
         ProgressResponseElement progressResponseElement = null;
@@ -1727,7 +1727,7 @@ private <T> ProgressResponseElement searchInWebhookFileNotFound(T timeLineOrStat
     }//searchInWebhookTimelineElement
 
     private <T> ProgressResponseElementV23 searchInWebhookFileNotFoundV23(T timeLineOrStatus, String lastEventId, int deepCount) {
-        if(!(timeLineOrStatus instanceof TimelineElementCategoryV23) && (!(timeLineOrStatus instanceof NotificationStatus)) {
+        if(!(timeLineOrStatus instanceof TimelineElementCategoryV23) && (!(timeLineOrStatus instanceof NotificationStatus))) {
             throw new IllegalArgumentException();
         }
 

diff --git a/src/test/java/it/pagopa/pn/cucumber/steps/pa/InvioNotificheB2bSteps.java b/src/test/java/it/pagopa/pn/cucumber/steps/pa/InvioNotificheB2bSteps.java
@@ -36,8 +36,6 @@
 import it.pagopa.pn.client.b2b.pa.service.impl.PnExternalServiceClientImpl;
 import it.pagopa.pn.client.b2b.pa.service.impl.PnPaymentInfoClientImpl;
 import it.pagopa.pn.client.b2b.pa.service.utils.SettableApiKey;
-import it.pagopa.pn.client.b2b.web.generated.openapi.clients.payment_info.model.PaymentInfoRequest;
-import it.pagopa.pn.client.b2b.web.generated.openapi.clients.payment_info.model.PaymentNotice;
 import it.pagopa.pn.client.web.generated.openapi.clients.webPa.model.NotificationSearchResponse;
 import it.pagopa.pn.client.web.generated.openapi.clients.webPa.model.NotificationSearchRow;
 import it.pagopa.pn.cucumber.steps.SharedSteps;
@@ -71,7 +69,8 @@
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.client.HttpStatusCodeException;
-
+import it.pagopa.pn.client.b2b.pa.generated.openapi.clients.externalb2bpa.model.*;
+import it.pagopa.pn.client.b2b.generated.openapi.clients.external.generate.model.external.bff.payment.PaymentInfoRequest;
 
 @Slf4j
 public class InvioNotificheB2bSteps {
@@ -99,7 +98,6 @@ public class InvioNotificheB2bSteps {
     private String sha256DocumentDownload;
     private NotificationAttachmentDownloadMetadataResponse downloadResponse;
     private List<ReceivedMessage> documentiPec;
-    private FullSentNotificationV23 notificationRetrieved;
 
     private final JavaMailSender emailSender;