transaction module refactoring

bank-account/account/account-adapters/build.gradle

@@ -2,8 +2,7 @@ description('account-adapter')
 
 dependencies {
     api project(':common-api')
-    api project(':bank-account:transaction-domain-api')
+    api project(':bank-account:transaction:transaction-domain-api')
     api project(':bank-account:account:account-api')
     api project(':bank-account:account:account-domain-api')
-    api project(':shared-spring-dependencies')
 }

bank-account/account/account-api/build.gradle

@@ -3,6 +3,5 @@ description('account api module')
 dependencies {
     api project(':common-api')
     api project(':common-components')
-    api project(':shared-spring-dependencies')
     api project(':bank-account:account:account-domain-api')
 }

bank-account/account/account-http-api/build.gradle

@@ -1,7 +1,6 @@
 dependencies {
     api project(':common-api')
     api project(':common-components')
-    api project(':shared-spring-dependencies')
     api project(':bank-account:account:account-domain-api')
     implementation project(':bank-account:account:account-api')
 }

bank-account/account/account-impl/build.gradle

@@ -4,9 +4,7 @@ dependencies {
     api project(':common-api')
     api project(':common-components')
     api project(':common-persistence')
-    api project(':shared-spring-dependencies')
-    api project(':shared-spring-dependencies')
-    api project(':bank-account:transaction-domain-api')
+    api project(':bank-account:transaction:transaction-domain-api')
     api project(':bank-account:account:account-domain-api')
     api project(':bank-account:account:account-api')
     api project(':bank-account:account:account-domain')

bank-account/bank-account-application/build.gradle

@@ -13,10 +13,10 @@ dependencies {
     implementation project(':bank-account:account:account-http-api')
     implementation project(':bank-account:account:account-domain')
     implementation project(':bank-account:account:account-adapters')
-    implementation project(':bank-account:transaction-impl')
-    implementation project(':bank-account:transaction-api')
-    implementation project(':bank-account:transaction-domain')
-    implementation project(':bank-account:transaction-adapters')
+    implementation project(':bank-account:transaction:transaction-impl')
+    implementation project(':bank-account:transaction:transaction-api')
+    implementation project(':bank-account:transaction:transaction-domain')
+    implementation project(':bank-account:transaction:transaction-adapters')
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.projectreactor:reactor-test'
 }

bank-account/transaction-adapters/build.gradle

@@ -1,9 +0,0 @@
-description('transactions-adapters')
-
-dependencies {
-    api project(':common-api')
-    api project(':bank-account:transaction-domain-api')
-    api project(':bank-account:transaction-api')
-    api project(':bank-account:account:account-domain-api')
-    api project(':shared-spring-dependencies')
-}

bank-account/transaction/transaction-adapters/build.gradle

@@ -0,0 +1,8 @@
+description('transactions-adapters')
+
+dependencies {
+    api project(':common-api')
+    api project(':bank-account:transaction:transaction-domain-api')
+    api project(':bank-account:transaction:transaction-api')
+    api project(':bank-account:account:account-domain-api')
+}

bank-account/transaction/transaction-api/build.gradle

@@ -3,6 +3,5 @@ description('transaction-api module')
 dependencies {
     api project(':common-api')
     api project(':common-components')
-    api project(':shared-spring-dependencies')
-    api project(':bank-account:transaction-domain-api')
+    api project(':bank-account:transaction:transaction-domain-api')
 }

bank-account/transaction/transaction-domain-api/src/main/java/com/mz/reactor/ddd/reactorddd/transaction/domain/command/CancelTransaction.java

@@ -4,8 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.immutables.value.Value;
 
-import java.util.concurrent.TransferQueue;
-
 @Value.Immutable
 @JsonSerialize(as = ImmutableCancelTransaction.class)
 @JsonDeserialize(as = ImmutableCancelTransaction.class)

bank-account/transaction/transaction-domain-api/src/main/java/com/mz/reactor/ddd/reactorddd/transaction/domain/event/TransactionFailed.java

@@ -2,7 +2,6 @@ package com.mz.reactor.ddd.reactorddd.transaction.domain.event;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.mz.reactor.ddd.reactorddd.transaction.domain.command.CancelTransaction;
 import com.mz.reactor.ddd.reactorddd.transaction.domain.command.CreateTransaction;
 import org.immutables.value.Value;
 

bank-account/transaction/transaction-domain/build.gradle

@@ -2,5 +2,5 @@ description 'bank transation domain'
 
 dependencies {
     api project(':common-api')
-    api project(':bank-account:transaction-domain-api')
+    api project(':bank-account:transaction:transaction-domain-api')
 }

bank-account/transaction/transaction-domain/src/test/java/com/mz/reactor/ddd/reactorddd/transaction/domain/TransactionAggregateTest.java

@@ -4,14 +4,16 @@ import com.mz.reactor.ddd.reactorddd.transaction.domain.command.CreateTransactio
 import com.mz.reactor.ddd.reactorddd.transaction.domain.command.FinishTransaction;
 import com.mz.reactor.ddd.reactorddd.transaction.domain.command.ValidateTransactionMoneyDeposit;
 import com.mz.reactor.ddd.reactorddd.transaction.domain.command.ValidateTransactionMoneyWithdraw;
-import com.mz.reactor.ddd.reactorddd.transaction.domain.event.*;
+import com.mz.reactor.ddd.reactorddd.transaction.domain.event.TransactionCreated;
+import com.mz.reactor.ddd.reactorddd.transaction.domain.event.TransactionFailed;
+import com.mz.reactor.ddd.reactorddd.transaction.domain.event.TransactionFinished;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
 
 class TransactionAggregateTest {
 

bank-account/transaction/transaction-domain/src/test/java/com/mz/reactor/ddd/reactorddd/transaction/domain/command/TransactionCommandHandlerTest.java

@@ -10,7 +10,8 @@ import org.junit.jupiter.api.Test;
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class TransactionCommandHandlerTest {
 

bank-account/transaction/transaction-impl/build.gradle

@@ -4,9 +4,8 @@ dependencies {
     api project(':common-api')
     api project(':common-components')
     api project(':common-persistence')
-    api project(':shared-spring-dependencies')
-    api project(':bank-account:transaction-domain-api')
     api project(':bank-account:account:account-domain-api')
-    api project(':bank-account:transaction-api')
-    api project(':bank-account:transaction-domain')
+    api project(':bank-account:transaction:transaction-domain-api')
+    api project(':bank-account:transaction:transaction-api')
+    api project(':bank-account:transaction:transaction-domain')
 }

bank-account/transaction/transaction-impl/src/main/java/com/mz/reactor/ddd/reactorddd/transaction/impl/TransactionApplicationServiceImpl.java

@@ -2,8 +2,6 @@ package com.mz.reactor.ddd.reactorddd.transaction.impl;
 
 import com.mz.reactor.ddd.common.api.event.DomainEvent;
 import com.mz.reactor.ddd.common.components.bus.ApplicationMessageBus;
-import com.mz.reactor.ddd.reactorddd.account.domain.command.AccountCommand;
-import com.mz.reactor.ddd.reactorddd.account.domain.event.MoneyDeposited;
 import com.mz.reactor.ddd.reactorddd.persistance.aggregate.AggregateFacade;
 import com.mz.reactor.ddd.reactorddd.transaction.api.TransactionApplicationService;
 import com.mz.reactor.ddd.reactorddd.transaction.api.TransactionQuery;

common-components/build.gradle

@@ -5,7 +5,6 @@ description('common compents such as message-buss component ...')
 
 dependencies {
     api project(':common-api')
-    api project(':shared-spring-dependencies')
     testImplementation 'io.projectreactor:reactor-test'
     implementation "org.immutables:value:$immutablesVersion"
 }

common-persistence/build.gradle

@@ -1,6 +1,4 @@
 dependencies {
     api project(':common-api')
-//        implementation group: 'io.projectreactor', name: 'reactor-core'
-    api project(':shared-spring-dependencies')
     testImplementation 'io.projectreactor:reactor-test'
 }

settings.gradle

@@ -1,27 +1,17 @@
-//pluginManagement {
-//    id 'io.spring.dependency-management' version "$springDependencyMavagementVersion"
-//    id 'java'
-//    id 'java-library'
-//}
-
-
 rootProject.name = 'reactor-ddd'
 include 'common-api'
 include 'shared-dependencies'
-include 'shared-spring-dependencies'
 include 'common-persistence'
 include 'common-components'
 include 'bank-account:bank-account-application'
 include 'bank-account:account:account-domain'
 include 'bank-account:account:account-domain-api'
 include 'bank-account:account:account-api'
+include 'bank-account:account:account-http-api'
 include 'bank-account:account:account-impl'
 include 'bank-account:account:account-adapters'
-include 'bank-account:transaction-domain'
-include 'bank-account:transaction-domain-api'
-include 'bank-account:transaction-impl'
-include 'bank-account:transaction-api'
-include 'bank-account:transaction-adapters'
-include 'bank-account:account:account-http-api'
-findProject(':bank-account:account:account-http-api')?.name = 'account-http-api'
-
+include 'bank-account:transaction:transaction-domain'
+include 'bank-account:transaction:transaction-domain-api'
+include 'bank-account:transaction:transaction-impl'
+include 'bank-account:transaction:transaction-api'
+include 'bank-account:transaction:transaction-adapters'