diff --git a/account-management/src/main/java/cz/muni/pa165/banking/application/controller/UserController.java b/account-management/src/main/java/cz/muni/pa165/banking/application/controller/UserController.java
index 1fa62d09d9fdf2888dc704daaf2c43ba96bf0a10..9c2bfb02981aefc5e2852ebc5464dd3f5f289660 100644
--- a/account-management/src/main/java/cz/muni/pa165/banking/application/controller/UserController.java
+++ b/account-management/src/main/java/cz/muni/pa165/banking/application/controller/UserController.java
@@ -4,7 +4,6 @@ import cz.muni.pa165.banking.account.management.UserApi;
import cz.muni.pa165.banking.account.management.dto.NewUserDto;
import cz.muni.pa165.banking.account.management.dto.UserDto;
import cz.muni.pa165.banking.application.facade.UserFacade;
-import cz.muni.pa165.banking.exception.EntityNotFoundException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
diff --git a/account-management/src/main/java/cz/muni/pa165/banking/application/service/AccountService.java b/account-management/src/main/java/cz/muni/pa165/banking/application/service/AccountService.java
index cf23bf59cda83ca88d3d062572381b2bf4bed4d3..7966ac928fa96e72dc37f10086edfbcc5c6aba97 100644
--- a/account-management/src/main/java/cz/muni/pa165/banking/application/service/AccountService.java
+++ b/account-management/src/main/java/cz/muni/pa165/banking/application/service/AccountService.java
@@ -11,7 +11,6 @@ import cz.muni.pa165.banking.domain.scheduled.recurrence.RecurrenceType;
import cz.muni.pa165.banking.domain.scheduled.repository.ScheduledPaymentRepository;
import cz.muni.pa165.banking.domain.user.repository.UserRepository;
import cz.muni.pa165.banking.exception.EntityNotFoundException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessFactoryTest.java b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessFactoryTest.java
index f6cf5dbd9f5182aad6be0869beb93421cb911734..7994b660d5350a67863b10acb6465e44abb3b0f3 100644
--- a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessFactoryTest.java
+++ b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessFactoryTest.java
@@ -103,23 +103,20 @@ class ProcessFactoryTest {
void transactionRequestCreated() {
ProcessTransactionRepository processTransactionRepository = mock(ProcessTransactionRepository.class);
ProcessRepository processRepository = mock(ProcessRepository.class);
- MessageProducer messageProducer = new MessageProducerSpy();
+ MessageProducerSpy messageProducer = new MessageProducerSpy();
ProcessFactory processFactory = new ProcessFactory(processTransactionRepository, processRepository);
Process createdProcess = processFactory.create(transaction, messageProducer);
- UUID sentUuid = WhiteboxImpl.getInternalState(messageProducer, "receivedUuid");
- TransactionType sentType = WhiteboxImpl.getInternalState(messageProducer, "receivedType");
-
- assertEquals(createdProcess.getUuid(), sentUuid);
- assertEquals(TransactionType.DEPOSIT, sentType);
+ assertEquals(createdProcess.getUuid(), messageProducer.receivedUuid);
+ assertEquals(TransactionType.DEPOSIT, messageProducer.receivedType);
}
- private class MessageProducerSpy implements MessageProducer {
+ private static class MessageProducerSpy implements MessageProducer {
- private UUID receivedUuid;
+ public UUID receivedUuid;
- private TransactionType receivedType;
+ public TransactionType receivedType;
@Override
public void send(ProcessRequest data) {
diff --git a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessMock.java b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessMock.java
index 9076a23e6dbefd934847d4c35713067f36624aac..f8fce15f3c547bea623057e3505be08c4e127fb0 100644
--- a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessMock.java
+++ b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/ProcessMock.java
@@ -4,7 +4,7 @@ import java.util.UUID;
public class ProcessMock extends Process {
- private UUID uuid;
+ private final UUID uuid;
public ProcessMock() {
super();
diff --git a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/DepositHandlerTest.java b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/DepositHandlerTest.java
index 719c6979d41329e0824e0b60a2f342bfc75748fe..da39d6016439a52512a3777f8494620de632044a 100644
--- a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/DepositHandlerTest.java
+++ b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/DepositHandlerTest.java
@@ -31,20 +31,18 @@ import static org.mockito.Mockito.when;
class DepositHandlerTest {
private boolean published = false;
-
- private static Account account;
+
private static Process process;
- private static ProcessTransaction processTransaction;
private static ProcessRepository processRepository;
private static ProcessTransactionRepository processTransactionRepository;
private static ProcessHandler depositHandler;
private static CurrencyConverter converter;
@BeforeAll
- static void init() {
- account = new Account("ACC");
+ static void init() {
+ Account account = new Account("ACC");
process = new ProcessMock();
- processTransaction = new ProcessTransaction(account, null, TransactionType.DEPOSIT, new Money(BigDecimal.ONE, Currency.getInstance("EUR")), "", process.getUuid());
+ ProcessTransaction processTransaction = new ProcessTransaction(account, null, TransactionType.DEPOSIT, new Money(BigDecimal.ONE, Currency.getInstance("EUR")), "", process.getUuid());
depositHandler = new DepositHandler();
processRepository = mock(ProcessRepository.class);
processTransactionRepository = mock(ProcessTransactionRepository.class);
diff --git a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/TransferHandlerTest.java b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/TransferHandlerTest.java
index cb7183ad820c9deebb233c977dda3b18a6852cb6..357e351209f18c0b39c46b19d9dfb32b0249d108 100644
--- a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/TransferHandlerTest.java
+++ b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/TransferHandlerTest.java
@@ -36,7 +36,6 @@ class TransferHandlerTest {
private static Account account1;
private static Account account2;
private static Process process;
- private static ProcessTransaction processTransaction;
private static ProcessRepository processRepository;
private static ProcessTransactionRepository processTransactionRepository;
private static ProcessHandler depositHandler;
@@ -47,7 +46,7 @@ class TransferHandlerTest {
account1 = new Account("ACC1");
account2 = new Account("ACC2");
process = new ProcessMock();
- processTransaction = new ProcessTransaction(account1, account2, TransactionType.TRANSFER, new Money(BigDecimal.ONE, Currency.getInstance("EUR")), "", process.getUuid());
+ ProcessTransaction processTransaction = new ProcessTransaction(account1, account2, TransactionType.TRANSFER, new Money(BigDecimal.ONE, Currency.getInstance("EUR")), "", process.getUuid());
depositHandler = new TransferHandler();
processRepository = mock(ProcessRepository.class);
processTransactionRepository = mock(ProcessTransactionRepository.class);
diff --git a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/WithdrawHandlerTest.java b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/WithdrawHandlerTest.java
index bdc7f7eec53fb744b277c34c4b5f08aa89eb23cc..10b13732189324ceaacbc04632e2644a8c7db682 100644
--- a/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/WithdrawHandlerTest.java
+++ b/transaction-processor/src/test/java/cz/muni/pa165/banking/domain/process/handler/WithdrawHandlerTest.java
@@ -32,9 +32,7 @@ class WithdrawHandlerTest {
private boolean published = false;
- private static Account account;
private static Process process;
- private static ProcessTransaction processTransaction;
private static ProcessRepository processRepository;
private static ProcessTransactionRepository processTransactionRepository;
private static ProcessHandler depositHandler;
@@ -42,9 +40,9 @@ class WithdrawHandlerTest {
@BeforeAll
static void init() {
- account = new Account("ACC");
+ Account account = new Account("ACC");
process = new ProcessMock();
- processTransaction = new ProcessTransaction(account, null, TransactionType.WITHDRAWAL, new Money(BigDecimal.ONE, Currency.getInstance("EUR")), "", process.getUuid());
+ ProcessTransaction processTransaction = new ProcessTransaction(account, null, TransactionType.WITHDRAWAL, new Money(BigDecimal.ONE, Currency.getInstance("EUR")), "", process.getUuid());
depositHandler = new WithdrawHandler();
processRepository = mock(ProcessRepository.class);
processTransactionRepository = mock(ProcessTransactionRepository.class);