Merge pull request #27 from pat-karakun/master

replace hardcoded package names with (unused) parameters

.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: "Checkout sources"
+      uses: actions/checkout@v1
+
+    - name: "Setup Java"
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+
+    - name: "Initialize Gradle dependencies cache"
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/build.gradle') }}
+
+    - name: "Run Gradle build"
+      run: chmod 755 gradlew && ./gradlew build
+
+    - name: "Zip build reports"
+      if: failure()
+      run: zip -r reports.zip build/reports
+
+    - uses: actions/upload-artifact@v1
+      name: "Upload build reports"
+      if: failure()
+      with:
+        name: reports
+        path: reports.zip

.travis.yml

@@ -1,17 +0,0 @@
-before_install:
- - chmod +x gradlew
- - |
-   if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.md)|^(LICENSE)'
-   then
-     echo "Not running CI since only docs were changed."
-     exit
-   fi
-
-install: ./gradlew assemble
-
-script: ./gradlew clean build --info
-
-language: java
-
-jdk:
-  - oraclejdk11

README.md

@@ -1,6 +1,8 @@
 # Example Implementation of a Hexagonal Architecture
 
-[![Build Status](https://travis-ci.org/thombergs/buckpal.svg?branch=master)](https://travis-ci.org/thombergs/buckpal)
+[![CI](https://github.com/thombergs/buckpal/actions/workflows/ci.yml/badge.svg)](https://github.com/thombergs/buckpal/actions/workflows/ci.yml)
+
+[![Get Your Hands Dirty On Clean Architecture](https://reflectoring.io/assets/img/get-your-hands-dirty-260x336.png)](https://reflectoring.io/book)
 
 This is the companion code to my eBook [Get Your Hands Dirty on Clean Architecture](https://leanpub.com/get-your-hands-dirty-on-clean-architecture).
 
@@ -13,5 +15,5 @@ It implements a domain-centric "Hexagonal" approach of a common web application
 
 ## Prerequisites
 
-* JDK 8
+* JDK 11
 * this project uses Lombok, so enable annotation processing in your IDE

adapters/buckpal-persistence/build.gradle

@@ -1,26 +0,0 @@
-dependencies {
-    implementation project(':common')
-    implementation project(':buckpal-application')
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'junit' // excluding junit 4
-    }
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.1'
-    testImplementation 'org.mockito:mockito-junit-jupiter:2.23.0'
-    testImplementation 'com.tngtech.archunit:archunit:0.9.3'
-    testImplementation 'de.adesso:junit-insights:1.1.0'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.4.2'
-    testImplementation 'com.h2database:h2'
-    testImplementation project(':buckpal-testdata')
-}
-
-test {
-    useJUnitPlatform()
-    systemProperty 'de.adesso.junitinsights.enabled', 'true'
-}

adapters/buckpal-persistence/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> {
-}

adapters/buckpal-persistence/src/test/java/io/reflectoring/buckpal/adapter/persistence/TestApplication.java

@@ -1,12 +0,0 @@
-package io.reflectoring.buckpal.adapter.persistence;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-class TestApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(TestApplication.class, args);
-	}
-}

adapters/buckpal-web/build.gradle

@@ -1,23 +0,0 @@
-dependencies {
-    implementation project(':common')
-    implementation project(':buckpal-application')
-    
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'junit' // excluding junit 4
-    }
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.1'
-    testImplementation 'org.mockito:mockito-junit-jupiter:2.23.0'
-    testImplementation 'com.tngtech.archunit:archunit:0.9.3'
-    testImplementation 'de.adesso:junit-insights:1.1.0'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.4.2'
-}
-
-test {
-    useJUnitPlatform()
-    systemProperty 'de.adesso.junitinsights.enabled', 'true'
-}

adapters/buckpal-web/build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

adapters/buckpal-web/src/test/java/io/reflectoring/buckpal/adapter/web/TestApplication.java

@@ -1,7 +0,0 @@
-package io.reflectoring.buckpal.adapter.web;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class TestApplication {
-}

buckpal-application/build.gradle

@@ -1,26 +0,0 @@
-dependencies {
-    implementation project(':common')
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
-
-    implementation 'javax.transaction:javax.transaction-api'
-
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'junit' // excluding junit 4
-    }
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.1'
-    testImplementation 'org.mockito:mockito-junit-jupiter:2.23.0'
-    testImplementation 'com.tngtech.archunit:archunit:0.9.3'
-    testImplementation 'de.adesso:junit-insights:1.1.0'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.4.2'
-    testImplementation project(':buckpal-testdata')
-}
-
-test {
-    useJUnitPlatform()
-    systemProperty 'de.adesso.junitinsights.enabled', 'true'
-}
-

buckpal-application/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);
-
-}

buckpal-application/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();
-		}
-	}
-
-}

buckpal-application/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);
-}

buckpal-application/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);
-
-}

buckpal-configuration/build.gradle

@@ -1,34 +0,0 @@
-plugins {
-    id "org.springframework.boot" version "2.1.9.RELEASE"
-}
-
-dependencies {
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-    
-    implementation project(':common')
-    implementation project(':buckpal-application')
-    implementation project(':adapters:buckpal-persistence')
-    implementation project(':adapters:buckpal-web')
-    implementation ('org.springframework.boot:spring-boot-starter-web')
-    runtimeOnly 'com.h2database:h2'
-
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'junit' // excluding junit 4
-    }
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.1'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.4.2'
-    testImplementation 'org.mockito:mockito-junit-jupiter:2.23.0'
-    testImplementation 'com.tngtech.archunit:archunit:0.9.3'
-    testImplementation 'de.adesso:junit-insights:1.1.0'
-    testImplementation 'com.h2database:h2'
-
-}
-
-test {
-    useJUnitPlatform()
-    systemProperty 'de.adesso.junitinsights.enabled', 'true'
-}
-
-

buckpal-testdata/build.gradle

@@ -1,3 +0,0 @@
-dependencies {
-    implementation project(':buckpal-application')
-}

build.gradle

@@ -1,29 +1,47 @@
 plugins {
-    id "io.spring.dependency-management" version "1.0.8.RELEASE"
+    id 'org.springframework.boot' version '2.4.3'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
-subprojects {
 
-    group = 'io.reflectoring.reviewapp'
+group = 'io.reflectoring.buckpal'
-    version = '0.0.1-SNAPSHOT'
+version = '0.0.1-SNAPSHOT'
 
-    apply plugin: 'java'
+apply plugin: 'java'
-    apply plugin: 'io.spring.dependency-management'
+apply plugin: 'io.spring.dependency-management'
-    apply plugin: 'java-library'
+apply plugin: 'java-library'
 
-    repositories {
+repositories {
-        jcenter()
+    mavenCentral()
+}
+
+compileJava {
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+
+dependencies {
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+
+    implementation ('org.springframework.boot:spring-boot-starter-web')
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    testImplementation('org.springframework.boot:spring-boot-starter-test') {
+        exclude group: 'junit' // excluding junit 4
     }
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.1'
+    testImplementation 'org.mockito:mockito-junit-jupiter:2.23.0'
+    testImplementation 'com.tngtech.archunit:archunit:0.16.0'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.4.2'
+    testImplementation 'com.h2database:h2'
 
-    dependencyManagement {
+    runtimeOnly 'com.h2database:h2'
-        imports {
-            mavenBom("org.springframework.boot:spring-boot-dependencies:2.1.9.RELEASE")
-        }
-    }
-
-    compileJava {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-    }
 
 }
+
+test {
+    useJUnitPlatform()
+}
+

common/build.gradle

@@ -1,5 +0,0 @@
-dependencies {
-    implementation 'org.springframework:spring-context'
-    implementation 'javax.validation:validation-api'
-}
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,7 +0,0 @@
-include 'common'
-include 'buckpal-configuration'
-
-include 'adapters:buckpal-web'
-include 'adapters:buckpal-persistence'
-include 'buckpal-application'
-include 'buckpal-testdata'

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/common/SelfValidating.java

@@ -10,9 +10,9 @@ import java.util.Set;
 public abstract class SelfValidating<T> {
 
   private Validator validator;
+  private static ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
 
   public SelfValidating() {
-    ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
     validator = factory.getValidator();
   }
 

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/archunit/ArchitectureElement.java

@@ -23,10 +23,10 @@ abstract class ArchitectureElement {
   static void denyDependency(String fromPackageName, String toPackageName, JavaClasses classes) {
     noClasses()
         .that()
-        .resideInAPackage("io.reflectoring.reviewapp.domain..")
+        .resideInAPackage(matchAllClassesInPackage(fromPackageName))
         .should()
         .dependOnClassesThat()
-        .resideInAnyPackage("io.reflectoring.reviewapp.application..")
+        .resideInAnyPackage(matchAllClassesInPackage(toPackageName))
         .check(classes);
   }
 
@@ -34,13 +34,7 @@ abstract class ArchitectureElement {
       List<String> fromPackages, List<String> toPackages, JavaClasses classes) {
     for (String fromPackage : fromPackages) {
       for (String toPackage : toPackages) {
-        noClasses()
+        denyDependency(fromPackage, toPackage, classes);
-            .that()
-            .resideInAPackage(matchAllClassesInPackage(fromPackage))
-            .should()
-            .dependOnClassesThat()
-            .resideInAnyPackage(matchAllClassesInPackage(toPackage))
-            .check(classes);
       }
     }
   }

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 {