From 12447ea195b720196e97d2a264127b6fa830662d Mon Sep 17 00:00:00 2001 From: Tom Hombergs Date: Sat, 16 Nov 2019 09:00:02 +1100 Subject: [PATCH] renamed "test" package to "common" and added stereotype annotations --- .../AccountPersistenceAdapter.java | 4 +-- .../AccountPersistenceAdapterTest.java | 4 +-- .../adapter/web/SendMoneyController.java | 2 ++ .../application/port/in/SendMoneyUseCase.java | 2 +- .../application/service/SendMoneyService.java | 13 ++++++---- .../buckpal/domain/AccountTest.java | 4 +-- .../buckpal/domain/ActivityWindowTest.java | 2 +- .../{testdata => common}/AccountTestData.java | 2 +- .../ActivityTestData.java | 2 +- .../PersistenceAdapter.java | 2 +- .../{testdata => common}/SelfValidating.java | 2 +- .../buckpal/{testdata => common}/UseCase.java | 2 +- .../{testdata => common}/WebAdapter.java | 2 +- .../buckpal/testdata/OutputAdapter.java | 26 ------------------- 14 files changed, 24 insertions(+), 45 deletions(-) rename buckpal-testdata/src/main/java/io/reflectoring/buckpal/{testdata => common}/AccountTestData.java (96%) rename buckpal-testdata/src/main/java/io/reflectoring/buckpal/{testdata => common}/ActivityTestData.java (97%) rename common/src/main/java/io/reflectoring/buckpal/{testdata => common}/PersistenceAdapter.java (94%) rename common/src/main/java/io/reflectoring/buckpal/{testdata => common}/SelfValidating.java (94%) rename common/src/main/java/io/reflectoring/buckpal/{testdata => common}/UseCase.java (94%) rename common/src/main/java/io/reflectoring/buckpal/{testdata => common}/WebAdapter.java (94%) delete mode 100644 common/src/main/java/io/reflectoring/buckpal/testdata/OutputAdapter.java diff --git a/adapters/buckpal-persistence/src/main/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapter.java b/adapters/buckpal-persistence/src/main/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapter.java index 92e8d5c..15dcd70 100644 --- a/adapters/buckpal-persistence/src/main/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapter.java +++ b/adapters/buckpal-persistence/src/main/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapter.java @@ -7,7 +7,7 @@ import java.util.List; import io.reflectoring.buckpal.application.port.out.LoadAccountPort; import io.reflectoring.buckpal.application.port.out.UpdateAccountStatePort; -import io.reflectoring.buckpal.testdata.PersistenceAdapter; +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; @@ -15,7 +15,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @RequiredArgsConstructor -@Component +@PersistenceAdapter class AccountPersistenceAdapter implements LoadAccountPort, UpdateAccountStatePort { diff --git a/adapters/buckpal-persistence/src/test/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapterTest.java b/adapters/buckpal-persistence/src/test/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapterTest.java index 34c026a..1036267 100644 --- a/adapters/buckpal-persistence/src/test/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapterTest.java +++ b/adapters/buckpal-persistence/src/test/java/io/reflectoring/buckpal/adapter/persistence/AccountPersistenceAdapterTest.java @@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.Import; import org.springframework.test.context.jdbc.Sql; -import static io.reflectoring.buckpal.testdata.AccountTestData.*; -import static io.reflectoring.buckpal.testdata.ActivityTestData.*; +import static io.reflectoring.buckpal.common.AccountTestData.*; +import static io.reflectoring.buckpal.common.ActivityTestData.*; import static org.assertj.core.api.Assertions.*; @DataJpaTest diff --git a/adapters/buckpal-web/src/main/java/io/reflectoring/buckpal/adapter/web/SendMoneyController.java b/adapters/buckpal-web/src/main/java/io/reflectoring/buckpal/adapter/web/SendMoneyController.java index 6678fd6..2157e56 100644 --- a/adapters/buckpal-web/src/main/java/io/reflectoring/buckpal/adapter/web/SendMoneyController.java +++ b/adapters/buckpal-web/src/main/java/io/reflectoring/buckpal/adapter/web/SendMoneyController.java @@ -2,6 +2,7 @@ package io.reflectoring.buckpal.adapter.web; import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase; import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase.SendMoneyCommand; +import io.reflectoring.buckpal.common.WebAdapter; import io.reflectoring.buckpal.domain.Account.AccountId; import io.reflectoring.buckpal.domain.Money; import lombok.RequiredArgsConstructor; @@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; +@WebAdapter @RestController @RequiredArgsConstructor public class SendMoneyController { diff --git a/buckpal-application/src/main/java/io/reflectoring/buckpal/application/port/in/SendMoneyUseCase.java b/buckpal-application/src/main/java/io/reflectoring/buckpal/application/port/in/SendMoneyUseCase.java index 5b72b1b..ddd1b0b 100644 --- a/buckpal-application/src/main/java/io/reflectoring/buckpal/application/port/in/SendMoneyUseCase.java +++ b/buckpal-application/src/main/java/io/reflectoring/buckpal/application/port/in/SendMoneyUseCase.java @@ -2,7 +2,7 @@ package io.reflectoring.buckpal.application.port.in; import io.reflectoring.buckpal.domain.Account.AccountId; import io.reflectoring.buckpal.domain.Money; -import io.reflectoring.buckpal.testdata.SelfValidating; +import io.reflectoring.buckpal.common.SelfValidating; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/buckpal-application/src/main/java/io/reflectoring/buckpal/application/service/SendMoneyService.java b/buckpal-application/src/main/java/io/reflectoring/buckpal/application/service/SendMoneyService.java index cb3b6a8..58b0456 100644 --- a/buckpal-application/src/main/java/io/reflectoring/buckpal/application/service/SendMoneyService.java +++ b/buckpal-application/src/main/java/io/reflectoring/buckpal/application/service/SendMoneyService.java @@ -4,17 +4,16 @@ import io.reflectoring.buckpal.application.port.in.SendMoneyUseCase; import io.reflectoring.buckpal.application.port.out.AccountLock; import io.reflectoring.buckpal.application.port.out.LoadAccountPort; import io.reflectoring.buckpal.application.port.out.UpdateAccountStatePort; +import io.reflectoring.buckpal.common.UseCase; import io.reflectoring.buckpal.domain.Account; import io.reflectoring.buckpal.domain.Account.AccountId; -import io.reflectoring.buckpal.testdata.UseCase; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; import javax.transaction.Transactional; import java.time.LocalDateTime; @RequiredArgsConstructor -@Component +@UseCase @Transactional public class SendMoneyService implements SendMoneyUseCase { @@ -39,9 +38,9 @@ public class SendMoneyService implements SendMoneyUseCase { baselineDate); AccountId sourceAccountId = sourceAccount.getId() - .orElseThrow(() -> new IllegalStateException("expected source account ID not to be empty")); + .orElseThrow(() -> new IllegalStateException("expected source account ID not to be empty")); AccountId targetAccountId = targetAccount.getId() - .orElseThrow(() -> new IllegalStateException("expected target account ID not to be empty")); + .orElseThrow(() -> new IllegalStateException("expected target account ID not to be empty")); accountLock.lockAccount(sourceAccountId); if (!sourceAccount.withdraw(command.getMoney(), targetAccountId)) { @@ -71,3 +70,7 @@ public class SendMoneyService implements SendMoneyUseCase { } } + + + + diff --git a/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/AccountTest.java b/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/AccountTest.java index d5b4866..3be0623 100644 --- a/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/AccountTest.java +++ b/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/AccountTest.java @@ -2,8 +2,8 @@ package io.reflectoring.buckpal.domain; import io.reflectoring.buckpal.domain.Account.AccountId; import org.junit.jupiter.api.Test; -import static io.reflectoring.buckpal.testdata.AccountTestData.*; -import static io.reflectoring.buckpal.testdata.ActivityTestData.*; +import static io.reflectoring.buckpal.common.AccountTestData.*; +import static io.reflectoring.buckpal.common.ActivityTestData.*; import static org.assertj.core.api.Assertions.*; class AccountTest { diff --git a/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/ActivityWindowTest.java b/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/ActivityWindowTest.java index 3a4085d..7485089 100644 --- a/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/ActivityWindowTest.java +++ b/buckpal-application/src/test/java/io/reflectoring/buckpal/domain/ActivityWindowTest.java @@ -5,7 +5,7 @@ import java.time.LocalDateTime; import io.reflectoring.buckpal.domain.Account.AccountId; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import static io.reflectoring.buckpal.testdata.ActivityTestData.*; +import static io.reflectoring.buckpal.common.ActivityTestData.*; class ActivityWindowTest { diff --git a/buckpal-testdata/src/main/java/io/reflectoring/buckpal/testdata/AccountTestData.java b/buckpal-testdata/src/main/java/io/reflectoring/buckpal/common/AccountTestData.java similarity index 96% rename from buckpal-testdata/src/main/java/io/reflectoring/buckpal/testdata/AccountTestData.java rename to buckpal-testdata/src/main/java/io/reflectoring/buckpal/common/AccountTestData.java index 327476c..d615898 100644 --- a/buckpal-testdata/src/main/java/io/reflectoring/buckpal/testdata/AccountTestData.java +++ b/buckpal-testdata/src/main/java/io/reflectoring/buckpal/common/AccountTestData.java @@ -1,4 +1,4 @@ -package io.reflectoring.buckpal.testdata; +package io.reflectoring.buckpal.common; import io.reflectoring.buckpal.domain.Account; import io.reflectoring.buckpal.domain.Account.AccountId; diff --git a/buckpal-testdata/src/main/java/io/reflectoring/buckpal/testdata/ActivityTestData.java b/buckpal-testdata/src/main/java/io/reflectoring/buckpal/common/ActivityTestData.java similarity index 97% rename from buckpal-testdata/src/main/java/io/reflectoring/buckpal/testdata/ActivityTestData.java rename to buckpal-testdata/src/main/java/io/reflectoring/buckpal/common/ActivityTestData.java index f6bd814..b4b8d56 100644 --- a/buckpal-testdata/src/main/java/io/reflectoring/buckpal/testdata/ActivityTestData.java +++ b/buckpal-testdata/src/main/java/io/reflectoring/buckpal/common/ActivityTestData.java @@ -1,4 +1,4 @@ -package io.reflectoring.buckpal.testdata; +package io.reflectoring.buckpal.common; import java.time.LocalDateTime; diff --git a/common/src/main/java/io/reflectoring/buckpal/testdata/PersistenceAdapter.java b/common/src/main/java/io/reflectoring/buckpal/common/PersistenceAdapter.java similarity index 94% rename from common/src/main/java/io/reflectoring/buckpal/testdata/PersistenceAdapter.java rename to common/src/main/java/io/reflectoring/buckpal/common/PersistenceAdapter.java index b4a465a..d76fdec 100644 --- a/common/src/main/java/io/reflectoring/buckpal/testdata/PersistenceAdapter.java +++ b/common/src/main/java/io/reflectoring/buckpal/common/PersistenceAdapter.java @@ -1,4 +1,4 @@ -package io.reflectoring.buckpal.testdata; +package io.reflectoring.buckpal.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/common/src/main/java/io/reflectoring/buckpal/testdata/SelfValidating.java b/common/src/main/java/io/reflectoring/buckpal/common/SelfValidating.java similarity index 94% rename from common/src/main/java/io/reflectoring/buckpal/testdata/SelfValidating.java rename to common/src/main/java/io/reflectoring/buckpal/common/SelfValidating.java index a9bd569..5dada92 100644 --- a/common/src/main/java/io/reflectoring/buckpal/testdata/SelfValidating.java +++ b/common/src/main/java/io/reflectoring/buckpal/common/SelfValidating.java @@ -1,4 +1,4 @@ -package io.reflectoring.buckpal.testdata; +package io.reflectoring.buckpal.common; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/common/src/main/java/io/reflectoring/buckpal/testdata/UseCase.java b/common/src/main/java/io/reflectoring/buckpal/common/UseCase.java similarity index 94% rename from common/src/main/java/io/reflectoring/buckpal/testdata/UseCase.java rename to common/src/main/java/io/reflectoring/buckpal/common/UseCase.java index c51f746..eca4e05 100644 --- a/common/src/main/java/io/reflectoring/buckpal/testdata/UseCase.java +++ b/common/src/main/java/io/reflectoring/buckpal/common/UseCase.java @@ -1,4 +1,4 @@ -package io.reflectoring.buckpal.testdata; +package io.reflectoring.buckpal.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/common/src/main/java/io/reflectoring/buckpal/testdata/WebAdapter.java b/common/src/main/java/io/reflectoring/buckpal/common/WebAdapter.java similarity index 94% rename from common/src/main/java/io/reflectoring/buckpal/testdata/WebAdapter.java rename to common/src/main/java/io/reflectoring/buckpal/common/WebAdapter.java index 247946f..db25ec4 100644 --- a/common/src/main/java/io/reflectoring/buckpal/testdata/WebAdapter.java +++ b/common/src/main/java/io/reflectoring/buckpal/common/WebAdapter.java @@ -1,4 +1,4 @@ -package io.reflectoring.buckpal.testdata; +package io.reflectoring.buckpal.common; import org.springframework.core.annotation.AliasFor; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/io/reflectoring/buckpal/testdata/OutputAdapter.java b/common/src/main/java/io/reflectoring/buckpal/testdata/OutputAdapter.java deleted file mode 100644 index 3da084e..0000000 --- a/common/src/main/java/io/reflectoring/buckpal/testdata/OutputAdapter.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.reflectoring.buckpal.testdata; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.springframework.core.annotation.AliasFor; -import org.springframework.stereotype.Component; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface OutputAdapter { - - /** - * The value may indicate a suggestion for a logical component name, - * to be turned into a Spring bean in case of an autodetected component. - * @return the suggested component name, if any (or empty String otherwise) - */ - @AliasFor(annotation = Component.class) - String value() default ""; - -}