From 995cde39f594c45cd4b635563bdcaab52db7635d Mon Sep 17 00:00:00 2001 From: Kammerlo Date: Mon, 3 Mar 2025 15:35:05 +0100 Subject: [PATCH] chore: spotless --- ...ntFcyBalanceZerosOutCheckTaskItemTest.java | 4 +- ...ntLcyBalanceZerosOutCheckTaskItemTest.java | 4 +- .../internal/TransactionConverter.java | 1 - .../NetSuiteExtractionServiceTest.java | 41 +++++++++---------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountFcyBalanceZerosOutCheckTaskItemTest.java b/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountFcyBalanceZerosOutCheckTaskItemTest.java index 4cd2dcd1..4a7dddc3 100644 --- a/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountFcyBalanceZerosOutCheckTaskItemTest.java +++ b/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountFcyBalanceZerosOutCheckTaskItemTest.java @@ -7,12 +7,10 @@ import java.math.BigDecimal; import java.util.Set; -import lombok.val; - -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.OperationType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.OperationType; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.Transaction; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.TransactionItem; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.TransactionType; diff --git a/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountLcyBalanceZerosOutCheckTaskItemTest.java b/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountLcyBalanceZerosOutCheckTaskItemTest.java index db789e30..a835087a 100644 --- a/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountLcyBalanceZerosOutCheckTaskItemTest.java +++ b/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/business_rules/items/AmountLcyBalanceZerosOutCheckTaskItemTest.java @@ -7,12 +7,10 @@ import java.math.BigDecimal; import java.util.Set; -import lombok.val; - -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.OperationType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.OperationType; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.Transaction; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.TransactionItem; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.TransactionType; diff --git a/netsuite_altavia_erp_adapter/src/main/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/TransactionConverter.java b/netsuite_altavia_erp_adapter/src/main/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/TransactionConverter.java index 414dbea7..385b6bc0 100644 --- a/netsuite_altavia_erp_adapter/src/main/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/TransactionConverter.java +++ b/netsuite_altavia_erp_adapter/src/main/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/TransactionConverter.java @@ -26,7 +26,6 @@ import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.FinancialPeriodSource; import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.Transactions; import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.TxLine; -import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.util.MoreBigDecimal; import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.util.MoreString; import org.cardanofoundation.lob.app.support.collections.Optionals; diff --git a/netsuite_altavia_erp_adapter/src/test/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/NetSuiteExtractionServiceTest.java b/netsuite_altavia_erp_adapter/src/test/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/NetSuiteExtractionServiceTest.java index e2650e9e..454461d3 100644 --- a/netsuite_altavia_erp_adapter/src/test/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/NetSuiteExtractionServiceTest.java +++ b/netsuite_altavia_erp_adapter/src/test/java/org/cardanofoundation/lob/app/netsuite_altavia_erp_adapter/service/internal/NetSuiteExtractionServiceTest.java @@ -3,7 +3,6 @@ import static java.util.Objects.requireNonNull; import static org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.util.MoreCompress.decompress; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -16,15 +15,6 @@ import java.util.Optional; import java.util.Set; -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.FatalError; -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.SystemExtractionParameters; -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.Transaction; -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchChunkEvent; -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchFailedEvent; -import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchStartedEvent; -import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.Transactions; -import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.TxLine; -import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.entity.NetSuiteIngestionEntity; import org.springframework.context.ApplicationEventPublisher; import io.vavr.control.Either; @@ -37,14 +27,23 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.FatalError; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.SystemExtractionParameters; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.Transaction; import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.UserExtractionParameters; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchChunkEvent; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchFailedEvent; +import org.cardanofoundation.lob.app.accounting_reporting_core.domain.event.extraction.TransactionBatchStartedEvent; import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.client.NetSuiteClient; +import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.Transactions; +import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.core.TxLine; +import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.domain.entity.NetSuiteIngestionEntity; import org.cardanofoundation.lob.app.netsuite_altavia_erp_adapter.repository.IngestionRepository; @ExtendWith(MockitoExtension.class) -public class NetSuiteExtractionServiceTest { +class NetSuiteExtractionServiceTest { - private final String INGESTION_BODY = "1f8b08000000000000ffed55c18ed33010bdef57583937959d2d42f4062b16b442805838210e537bd25a9bd8d1d8e9365af5df99a4dd264d5b71022144955aedcc7bf6ccf33ce5e94a88a4f484c95ce450049cb481c23a0c1cf9ce7f8478ea560e877a11acb1408df32b8b04a4570dc3d4e419119baadd29b9f33539289243c240444dc8ab69f399cc5ea4324b3329d4cb393f52f6d802422cbdb1b945d3f27e4988046e009ca52a4baf959072de3d3d10dd61c36376001dad77ae2e17485d039fbe7df9f8fa43c69f41612c0b27e511d5760dddbd4da594aac7aef92c4f5374d1c6668739496a5f56e01a07e5a8248315502c997c2cf400a259a570311b61a3bd19ed0a5afbdac569dfe54c49a5f83bd4e880da57f5d54728c43bf22108ebb8641439f952042850f85c2cbd3741f0058880b4b61a83988bfb7d7210fa4c7e6d038b1c44ee49205009f48046e475ac09056e2a7481c76e5c4909d68d7aaf89d0e9aee7fb47cb85ddf245e81e70b3074c43532e7cd1e26ededf0ee660a357e0962cdd6e18d474a880c1858df906caf6f4d1c984e638a7e429f732f398d767cbba88b6b7570b18941b22c43a10e66d1caa8a95641b9ddc9875115bd7eda64d5dcfb2a4836c27ff6d7cc6c6eadfb271f6676cfca6b68511556fe654f0783e58b714848f40e66f34f0c8a4a72ebe68e0b3cc73bcdfe1e0997ab57730af3fba37f31a8a1a5758540cd8193a697fb580edd5f62767da246cce070000"; + private final String ingestionBody = "1f8b08000000000000ffed55c18ed33010bdef57583937959d2d42f4062b16b442805838210e537bd25a9bd8d1d8e9365af5df99a4dd264d5b71022144955aedcc7bf6ccf33ce5e94a88a4f484c95ce450049cb481c23a0c1cf9ce7f8478ea560e877a11acb1408df32b8b04a4570dc3d4e419119baadd29b9f33539289243c240444dc8ab69f399cc5ea4324b3329d4cb393f52f6d802422cbdb1b945d3f27e4988046e009ca52a4baf959072de3d3d10dd61c36376001dad77ae2e17485d039fbe7df9f8fa43c69f41612c0b27e511d5760dddbd4da594aac7aef92c4f5374d1c6668739496a5f56e01a07e5a8248315502c997c2cf400a259a570311b61a3bd19ed0a5afbdac569dfe54c49a5f83bd4e880da57f5d54728c43bf22108ebb8641439f952042850f85c2cbd3741f0058880b4b61a83988bfb7d7210fa4c7e6d038b1c44ee49205009f48046e475ac09056e2a7481c76e5c4909d68d7aaf89d0e9aee7fb47cb85ddf245e81e70b3074c43532e7cd1e26ededf0ee660a357e0962cdd6e18d474a880c1858df906caf6f4d1c984e638a7e429f732f398d767cbba88b6b7570b18941b22c43a10e66d1caa8a95641b9ddc9875115bd7eda64d5dcfb2a4836c27ff6d7cc6c6eadfb271f6676cfca6b68511556fe654f0783e58b714848f40e66f34f0c8a4a72ebe68e0b3cc73bcdfe1e0997ab57730af3fba37f31a8a1a5758540cd8193a697fb580edd5f62767da246cce070000"; @Mock private IngestionRepository ingestionRepository; @@ -162,8 +161,8 @@ void testContinueERPExtraction_orgIdMismatch() { @Test void testContinueERPExtraction_parseSearchFailed() { - when(ingestionRepository.findById("id")).thenReturn(Optional.of(new NetSuiteIngestionEntity("id", "adapterInstanceId", INGESTION_BODY,"ingestionBodyDebug", "ingestionChecksum"))); - when(netSuiteParser.parseSearchResults(requireNonNull(decompress(INGESTION_BODY)))).thenReturn(Either.left(Problem.builder() + when(ingestionRepository.findById("id")).thenReturn(Optional.of(new NetSuiteIngestionEntity("id", "adapterInstanceId", ingestionBody,"ingestionBodyDebug", "ingestionChecksum"))); + when(netSuiteParser.parseSearchResults(requireNonNull(decompress(ingestionBody)))).thenReturn(Either.left(Problem.builder() .withStatus(Status.BAD_REQUEST) .withTitle("testTitle") .withDetail("testDetail") @@ -173,28 +172,28 @@ void testContinueERPExtraction_parseSearchFailed() { verify(applicationEventPublisher).publishEvent(any(TransactionBatchFailedEvent.class)); verify(ingestionRepository).findById("id"); - verify(netSuiteParser).parseSearchResults(requireNonNull(decompress(INGESTION_BODY))); + verify(netSuiteParser).parseSearchResults(requireNonNull(decompress(ingestionBody))); verifyNoMoreInteractions(applicationEventPublisher, ingestionRepository, netSuiteParser); } @Test void testContinueERPExtraction_transactionConvertFailed() { - when(ingestionRepository.findById("id")).thenReturn(Optional.of(new NetSuiteIngestionEntity("id", "adapterInstanceId", INGESTION_BODY,"ingestionBodyDebug", "ingestionChecksum"))); - when(netSuiteParser.parseSearchResults(requireNonNull(decompress(INGESTION_BODY)))).thenReturn(Either.right(List.of())); + when(ingestionRepository.findById("id")).thenReturn(Optional.of(new NetSuiteIngestionEntity("id", "adapterInstanceId", ingestionBody,"ingestionBodyDebug", "ingestionChecksum"))); + when(netSuiteParser.parseSearchResults(requireNonNull(decompress(ingestionBody)))).thenReturn(Either.right(List.of())); when(transactionConverter.convert("org", "id", List.of())).thenReturn(Either.left(new FatalError(FatalError.Code.ADAPTER_ERROR, "test", Map.of()))); netSuiteExtractionService.continueERPExtraction("id", "orgId", UserExtractionParameters.builder().organisationId("org").from(LocalDate.now()).to(LocalDate.now()).build(), SystemExtractionParameters.builder().organisationId("org").build()); verify(applicationEventPublisher).publishEvent(any(TransactionBatchFailedEvent.class)); verify(ingestionRepository).findById("id"); - verify(netSuiteParser).parseSearchResults(requireNonNull(decompress(INGESTION_BODY))); + verify(netSuiteParser).parseSearchResults(requireNonNull(decompress(ingestionBody))); verifyNoMoreInteractions(applicationEventPublisher, ingestionRepository, netSuiteParser); } @Test void testContinueERPExtraction_transactionConvertSuccess() { TxLine mockTxLine = mock(TxLine.class); - when(ingestionRepository.findById("id")).thenReturn(Optional.of(new NetSuiteIngestionEntity("id", "adapterInstanceId", INGESTION_BODY,"ingestionBodyDebug", "ingestionChecksum"))); - when(netSuiteParser.parseSearchResults(requireNonNull(decompress(INGESTION_BODY)))).thenReturn(Either.right(List.of(mockTxLine))); + when(ingestionRepository.findById("id")).thenReturn(Optional.of(new NetSuiteIngestionEntity("id", "adapterInstanceId", ingestionBody,"ingestionBodyDebug", "ingestionChecksum"))); + when(netSuiteParser.parseSearchResults(requireNonNull(decompress(ingestionBody)))).thenReturn(Either.right(List.of(mockTxLine))); when(transactionConverter.convert("orgId", "id", List.of(mockTxLine))).thenReturn(Either.right(new Transactions("org", Set.of()))); when(extractionParametersFilteringService.applyExtractionParameters(any(), any(), any())).thenReturn(Set.of(Transaction.builder().id("id1").build(), Transaction.builder().id("id2").build(), Transaction.builder().id("id3").build())); @@ -202,7 +201,7 @@ void testContinueERPExtraction_transactionConvertSuccess() { verify(applicationEventPublisher, times(3)).publishEvent(any(TransactionBatchChunkEvent.class)); verify(ingestionRepository).findById("id"); - verify(netSuiteParser).parseSearchResults(requireNonNull(decompress(INGESTION_BODY))); + verify(netSuiteParser).parseSearchResults(requireNonNull(decompress(ingestionBody))); verify(transactionConverter).convert("orgId", "id", List.of(mockTxLine)); verifyNoMoreInteractions(applicationEventPublisher, ingestionRepository, netSuiteParser, transactionConverter); }