refactor code to be easier to match with the code snippets in the book

src/main/java/io/reflectoring/buckpal/BuckPalConfiguration.java

@@ -1,7 +1,7 @@
 package io.reflectoring.buckpal;
 
-import io.reflectoring.buckpal.application.service.MoneyTransferProperties;
+import io.reflectoring.buckpal.account.application.service.MoneyTransferProperties;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/io/reflectoring/buckpal/account/adapter/in/web/SendMoneyController.java

@@ -1,10 +1,10 @@
-package io.reflectoring.buckpal.adapter.web;
+package io.reflectoring.buckpal.account.adapter.in.web;
 
-import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyUseCase;
-import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase.SendMoneyCommand;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyCommand;
 import io.reflectoring.buckpal.common.WebAdapter;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/io/reflectoring/buckpal/account/adapter/out/persistence/AccountJpaEntity.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.adapter.persistence;
+package io.reflectoring.buckpal.account.adapter.out.persistence;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

src/main/java/io/reflectoring/buckpal/account/adapter/out/persistence/AccountMapper.java

@@ -1,14 +1,14 @@
-package io.reflectoring.buckpal.adapter.persistence;
+package io.reflectoring.buckpal.account.adapter.out.persistence;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Activity;
+import io.reflectoring.buckpal.account.domain.Activity;
-import io.reflectoring.buckpal.domain.Activity.ActivityId;
+import io.reflectoring.buckpal.account.domain.Activity.ActivityId;
-import io.reflectoring.buckpal.domain.ActivityWindow;
+import io.reflectoring.buckpal.account.domain.ActivityWindow;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import org.springframework.stereotype.Component;
 
 @Component

src/main/java/io/reflectoring/buckpal/account/adapter/out/persistence/AccountPersistenceAdapter.java

@@ -1,18 +1,17 @@
-package io.reflectoring.buckpal.adapter.persistence;
+package io.reflectoring.buckpal.account.adapter.out.persistence;
 
 import javax.persistence.EntityNotFoundException;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
-import io.reflectoring.buckpal.application.port.out.LoadAccountPort;
+import io.reflectoring.buckpal.account.application.port.out.LoadAccountPort;
-import io.reflectoring.buckpal.application.port.out.UpdateAccountStatePort;
+import io.reflectoring.buckpal.account.application.port.out.UpdateAccountStatePort;
+import io.reflectoring.buckpal.account.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Activity;
 import io.reflectoring.buckpal.common.PersistenceAdapter;
-import io.reflectoring.buckpal.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Activity;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 
 @RequiredArgsConstructor
 @PersistenceAdapter
@@ -20,7 +19,7 @@ class AccountPersistenceAdapter implements
 		LoadAccountPort,
 		UpdateAccountStatePort {
 
-	private final AccountRepository accountRepository;
+	private final SpringDataAccountRepository accountRepository;
 	private final ActivityRepository activityRepository;
 	private final AccountMapper accountMapper;
 

src/main/java/io/reflectoring/buckpal/account/adapter/out/persistence/ActivityJpaEntity.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.adapter.persistence;
+package io.reflectoring.buckpal.account.adapter.out.persistence;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/io/reflectoring/buckpal/account/adapter/out/persistence/ActivityRepository.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.adapter.persistence;
+package io.reflectoring.buckpal.account.adapter.out.persistence;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/io/reflectoring/buckpal/account/adapter/out/persistence/SpringDataAccountRepository.java

@@ -0,0 +1,6 @@
+package io.reflectoring.buckpal.account.adapter.out.persistence;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+interface SpringDataAccountRepository extends JpaRepository<AccountJpaEntity, Long> {
+}

src/main/java/io/reflectoring/buckpal/account/application/port/in/GetAccountBalanceQuery.java

@@ -0,0 +1,10 @@
+package io.reflectoring.buckpal.account.application.port.in;
+
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Money;
+
+public interface GetAccountBalanceQuery {
+
+	Money getAccountBalance(AccountId accountId);
+
+}

src/main/java/io/reflectoring/buckpal/account/application/port/in/SendMoneyCommand.java

@@ -0,0 +1,34 @@
+package io.reflectoring.buckpal.account.application.port.in;
+
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Money;
+import io.reflectoring.buckpal.common.SelfValidating;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+import javax.validation.constraints.NotNull;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public
+class SendMoneyCommand extends SelfValidating<SendMoneyCommand> {
+
+    @NotNull
+    private final AccountId sourceAccountId;
+
+    @NotNull
+    private final AccountId targetAccountId;
+
+    @NotNull
+    private final Money money;
+
+    public SendMoneyCommand(
+            AccountId sourceAccountId,
+            AccountId targetAccountId,
+            Money money) {
+        this.sourceAccountId = sourceAccountId;
+        this.targetAccountId = targetAccountId;
+        this.money = money;
+        this.validateSelf();
+    }
+}

src/main/java/io/reflectoring/buckpal/account/application/port/in/SendMoneyUseCase.java

@@ -0,0 +1,11 @@
+package io.reflectoring.buckpal.account.application.port.in;
+
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Money;
+import io.reflectoring.buckpal.common.SelfValidating;
+
+public interface SendMoneyUseCase {
+
+	boolean sendMoney(SendMoneyCommand command);
+
+}

src/main/java/io/reflectoring/buckpal/account/application/port/out/AccountLock.java

@@ -1,6 +1,6 @@
-package io.reflectoring.buckpal.application.port.out;
+package io.reflectoring.buckpal.account.application.port.out;
 
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
 
 public interface AccountLock {
 

src/main/java/io/reflectoring/buckpal/account/application/port/out/LoadAccountPort.java

@@ -0,0 +1,11 @@
+package io.reflectoring.buckpal.account.application.port.out;
+
+import java.time.LocalDateTime;
+
+import io.reflectoring.buckpal.account.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
+
+public interface LoadAccountPort {
+
+	Account loadAccount(AccountId accountId, LocalDateTime baselineDate);
+}

src/main/java/io/reflectoring/buckpal/account/application/port/out/UpdateAccountStatePort.java

@@ -0,0 +1,9 @@
+package io.reflectoring.buckpal.account.application.port.out;
+
+import io.reflectoring.buckpal.account.domain.Account;
+
+public interface UpdateAccountStatePort {
+
+	void updateActivities(Account account);
+
+}

src/main/java/io/reflectoring/buckpal/account/application/service/GetAccountBalanceService.java

@@ -1,11 +1,11 @@
-package io.reflectoring.buckpal.application.service;
+package io.reflectoring.buckpal.account.application.service;
 
 import java.time.LocalDateTime;
 
-import io.reflectoring.buckpal.application.port.in.GetAccountBalanceQuery;
+import io.reflectoring.buckpal.account.application.port.in.GetAccountBalanceQuery;
-import io.reflectoring.buckpal.application.port.out.LoadAccountPort;
+import io.reflectoring.buckpal.account.application.port.out.LoadAccountPort;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

src/main/java/io/reflectoring/buckpal/account/application/service/MoneyTransferProperties.java

@@ -1,6 +1,6 @@
-package io.reflectoring.buckpal.application.service;
+package io.reflectoring.buckpal.account.application.service;
 
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/io/reflectoring/buckpal/account/application/service/NoOpAccountLock.java

@@ -1,7 +1,7 @@
-package io.reflectoring.buckpal.application.service;
+package io.reflectoring.buckpal.account.application.service;
 
-import io.reflectoring.buckpal.application.port.out.AccountLock;
+import io.reflectoring.buckpal.account.application.port.out.AccountLock;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
 import org.springframework.stereotype.Component;
 
 @Component

src/main/java/io/reflectoring/buckpal/account/application/service/SendMoneyService.java

@@ -1,12 +1,13 @@
-package io.reflectoring.buckpal.application.service;
+package io.reflectoring.buckpal.account.application.service;
 
-import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyCommand;
-import io.reflectoring.buckpal.application.port.out.AccountLock;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyUseCase;
-import io.reflectoring.buckpal.application.port.out.LoadAccountPort;
+import io.reflectoring.buckpal.account.application.port.out.AccountLock;
-import io.reflectoring.buckpal.application.port.out.UpdateAccountStatePort;
+import io.reflectoring.buckpal.account.application.port.out.LoadAccountPort;
+import io.reflectoring.buckpal.account.application.port.out.UpdateAccountStatePort;
 import io.reflectoring.buckpal.common.UseCase;
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
 import lombok.RequiredArgsConstructor;
 
 import javax.transaction.Transactional;

src/main/java/io/reflectoring/buckpal/account/application/service/ThresholdExceededException.java

@@ -1,6 +1,6 @@
-package io.reflectoring.buckpal.application.service;
+package io.reflectoring.buckpal.account.application.service;
 
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 
 public class ThresholdExceededException extends RuntimeException {
 

src/main/java/io/reflectoring/buckpal/account/domain/Account.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.domain;
+package io.reflectoring.buckpal.account.domain;
 
 import java.time.LocalDateTime;
 import java.util.Optional;

src/main/java/io/reflectoring/buckpal/account/domain/Activity.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.domain;
+package io.reflectoring.buckpal.account.domain;
 
 import java.time.LocalDateTime;
 

src/main/java/io/reflectoring/buckpal/account/domain/ActivityWindow.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.domain;
+package io.reflectoring.buckpal.account.domain;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
 import lombok.NonNull;
 
 /**

src/main/java/io/reflectoring/buckpal/account/domain/Money.java

@@ -1,4 +1,4 @@
-package io.reflectoring.buckpal.domain;
+package io.reflectoring.buckpal.account.domain;
 
 import java.math.BigInteger;
 

src/main/java/io/reflectoring/buckpal/adapter/persistence/AccountRepository.java

@@ -1,6 +0,0 @@
-package io.reflectoring.buckpal.adapter.persistence;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-interface AccountRepository extends JpaRepository<AccountJpaEntity, Long> {
-}

src/main/java/io/reflectoring/buckpal/application/port/in/GetAccountBalanceQuery.java

@@ -1,10 +0,0 @@
-package io.reflectoring.buckpal.application.port.in;
-
-import io.reflectoring.buckpal.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
-
-public interface GetAccountBalanceQuery {
-
-	Money getAccountBalance(AccountId accountId);
-
-}

src/main/java/io/reflectoring/buckpal/application/port/in/SendMoneyUseCase.java

@@ -1,39 +0,0 @@
-package io.reflectoring.buckpal.application.port.in;
-
-import io.reflectoring.buckpal.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
-import io.reflectoring.buckpal.common.SelfValidating;
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-
-import javax.validation.constraints.NotNull;
-
-public interface SendMoneyUseCase {
-
-	boolean sendMoney(SendMoneyCommand command);
-
-	@Value
-	@EqualsAndHashCode(callSuper = false)
-	class SendMoneyCommand extends SelfValidating<SendMoneyCommand> {
-
-		@NotNull
-		private final AccountId sourceAccountId;
-
-		@NotNull
-		private final AccountId targetAccountId;
-
-		@NotNull
-		private final Money money;
-
-		public SendMoneyCommand(
-				AccountId sourceAccountId,
-				AccountId targetAccountId,
-				Money money) {
-			this.sourceAccountId = sourceAccountId;
-			this.targetAccountId = targetAccountId;
-			this.money = money;
-			this.validateSelf();
-		}
-	}
-
-}

src/main/java/io/reflectoring/buckpal/application/port/out/LoadAccountPort.java

@@ -1,11 +0,0 @@
-package io.reflectoring.buckpal.application.port.out;
-
-import java.time.LocalDateTime;
-
-import io.reflectoring.buckpal.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
-
-public interface LoadAccountPort {
-
-	Account loadAccount(AccountId accountId, LocalDateTime baselineDate);
-}

src/main/java/io/reflectoring/buckpal/application/port/out/UpdateAccountStatePort.java

@@ -1,9 +0,0 @@
-package io.reflectoring.buckpal.application.port.out;
-
-import io.reflectoring.buckpal.domain.Account;
-
-public interface UpdateAccountStatePort {
-
-	void updateActivities(Account account);
-
-}

src/test/java/io/reflectoring/buckpal/DependencyRuleTests.java

@@ -9,13 +9,13 @@ class DependencyRuleTests {
 
 	@Test
 	void validateRegistrationContextArchitecture() {
-		HexagonalArchitecture.boundedContext("io.reflectoring.buckpal")
+		HexagonalArchitecture.boundedContext("io.reflectoring.buckpal.account")
 
 				.withDomainLayer("domain")
 
 				.withAdaptersLayer("adapter")
-				.incoming("web")
+				.incoming("in.web")
-				.outgoing("persistence")
+				.outgoing("out.persistence")
 				.and()
 
 				.withApplicationLayer("application")

src/test/java/io/reflectoring/buckpal/SendMoneySystemTest.java

@@ -2,10 +2,10 @@ package io.reflectoring.buckpal;
 
 import java.time.LocalDateTime;
 
-import io.reflectoring.buckpal.application.port.out.LoadAccountPort;
+import io.reflectoring.buckpal.account.application.port.out.LoadAccountPort;
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

src/test/java/io/reflectoring/buckpal/account/adapter/in/web/SendMoneyControllerTest.java

@@ -1,9 +1,9 @@
-package io.reflectoring.buckpal.adapter.web;
+package io.reflectoring.buckpal.account.adapter.in.web;
 
-import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyUseCase;
-import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase.SendMoneyCommand;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyCommand;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;

src/test/java/io/reflectoring/buckpal/account/adapter/out/persistence/AccountPersistenceAdapterTest.java

@@ -1,11 +1,11 @@
-package io.reflectoring.buckpal.adapter.persistence;
+package io.reflectoring.buckpal.account.adapter.out.persistence;
 
 import java.time.LocalDateTime;
 
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.ActivityWindow;
+import io.reflectoring.buckpal.account.domain.ActivityWindow;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.jdbc.Sql;
 import static io.reflectoring.buckpal.common.AccountTestData.*;
 import static io.reflectoring.buckpal.common.ActivityTestData.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest
 @Import({AccountPersistenceAdapter.class, AccountMapper.class})

src/test/java/io/reflectoring/buckpal/account/application/domain/AccountTest.java

@@ -1,6 +1,6 @@
-package io.reflectoring.buckpal.domain;
+package io.reflectoring.buckpal.account.domain;
 
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
 import org.junit.jupiter.api.Test;
 import static io.reflectoring.buckpal.common.AccountTestData.*;
 import static io.reflectoring.buckpal.common.ActivityTestData.*;

src/test/java/io/reflectoring/buckpal/account/application/domain/ActivityWindowTest.java

@@ -1,8 +1,8 @@
-package io.reflectoring.buckpal.domain;
+package io.reflectoring.buckpal.account.domain;
 
 import java.time.LocalDateTime;
 
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import static io.reflectoring.buckpal.common.ActivityTestData.*;

src/test/java/io/reflectoring/buckpal/account/application/service/SendMoneyServiceTest.java

@@ -1,12 +1,12 @@
-package io.reflectoring.buckpal.application.service;
+package io.reflectoring.buckpal.account.application.service;
 
-import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase.SendMoneyCommand;
+import io.reflectoring.buckpal.account.application.port.in.SendMoneyCommand;
-import io.reflectoring.buckpal.application.port.out.AccountLock;
+import io.reflectoring.buckpal.account.application.port.out.AccountLock;
-import io.reflectoring.buckpal.application.port.out.LoadAccountPort;
+import io.reflectoring.buckpal.account.application.port.out.LoadAccountPort;
-import io.reflectoring.buckpal.application.port.out.UpdateAccountStatePort;
+import io.reflectoring.buckpal.account.application.port.out.UpdateAccountStatePort;
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;

src/test/java/io/reflectoring/buckpal/common/AccountTestData.java

@@ -1,9 +1,9 @@
 package io.reflectoring.buckpal.common;
 
-import io.reflectoring.buckpal.domain.Account;
+import io.reflectoring.buckpal.account.domain.Account;
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.ActivityWindow;
+import io.reflectoring.buckpal.account.domain.ActivityWindow;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 
 public class AccountTestData {
 

src/test/java/io/reflectoring/buckpal/common/ActivityTestData.java

@@ -2,10 +2,10 @@ package io.reflectoring.buckpal.common;
 
 import java.time.LocalDateTime;
 
-import io.reflectoring.buckpal.domain.Account.AccountId;
+import io.reflectoring.buckpal.account.domain.Account.AccountId;
-import io.reflectoring.buckpal.domain.Activity;
+import io.reflectoring.buckpal.account.domain.Activity;
-import io.reflectoring.buckpal.domain.Activity.ActivityId;
+import io.reflectoring.buckpal.account.domain.Activity.ActivityId;
-import io.reflectoring.buckpal.domain.Money;
+import io.reflectoring.buckpal.account.domain.Money;
 
 public class ActivityTestData {