- removed optional classes and interfaces in order to simplify the example

- final fields are marked as final
- removed unnecessary temp variables
- added private constructor for not instantiated static class AccountAggregate
- path of te test file is corrected

Author: Serdar Hamzaoğulları

event-sourcing/etc/event-sourcing.png

@@ -22,12 +22,13 @@
  */
 package com.iluwatar.event.sourcing.app;
 
-import com.iluwatar.event.sourcing.journal.JsonFileJournal;
+import com.iluwatar.event.sourcing.event.AccountCreateEvent;
+import com.iluwatar.event.sourcing.event.MoneyDepositEvent;
+import com.iluwatar.event.sourcing.event.MoneyTransferEvent;
 import com.iluwatar.event.sourcing.processor.DomainEventProcessor;
-import com.iluwatar.event.sourcing.AccountService;
-import com.iluwatar.event.sourcing.MoneyTransactionService;
 import com.iluwatar.event.sourcing.state.AccountAggregate;
 import java.math.BigDecimal;
+import java.util.Date;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +52,13 @@
 public class App {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+  /**
+   * The constant ACCOUNT OF DAENERYS.
+   */
   public static final int ACCOUNT_OF_DAENERYS = 1;
+  /**
+   * The constant ACCOUNT OF JON.
+   */
   public static final int ACCOUNT_OF_JON = 2;
 
   /**
@@ -61,28 +68,31 @@ public class App {
    */
   public static void main(String[] args) {
 
-    DomainEventProcessor domainEventProcessor = new DomainEventProcessor();
-    JsonFileJournal jsonFileJournal = new JsonFileJournal();
-    domainEventProcessor.setPrecessorJournal(jsonFileJournal);
-    AccountService accountService = new AccountService(domainEventProcessor);
-    MoneyTransactionService moneyTransactionService = new MoneyTransactionService(
-        domainEventProcessor);
+    DomainEventProcessor eventProcessor = new DomainEventProcessor();
+
 
     LOGGER.info("Running the system first time............");
-    jsonFileJournal.reset();
+    eventProcessor.reset();
 
     LOGGER.info("Creating th accounts............");
 
-    accountService.createAccount(ACCOUNT_OF_DAENERYS, "Daenerys Targaryen");
-    accountService.createAccount(ACCOUNT_OF_JON, "Jon Snow");
+    eventProcessor.process(new AccountCreateEvent(
+        0, new Date().getTime(), ACCOUNT_OF_DAENERYS, "Daenerys Targaryen"));
+
+    eventProcessor.process(new AccountCreateEvent(
+        1, new Date().getTime(), ACCOUNT_OF_JON, "Jon Snow"));
 
     LOGGER.info("Do some money operations............");
 
-    moneyTransactionService.depositMoney(ACCOUNT_OF_DAENERYS, new BigDecimal("100000"));
-    moneyTransactionService.depositMoney(ACCOUNT_OF_JON, new BigDecimal("100"));
+    eventProcessor.process(new MoneyDepositEvent(
+        2, new Date().getTime(), ACCOUNT_OF_DAENERYS,  new BigDecimal("100000")));
+
+    eventProcessor.process(new MoneyDepositEvent(
+        3, new Date().getTime(), ACCOUNT_OF_JON,  new BigDecimal("100")));
 
-    moneyTransactionService.transferMoney(ACCOUNT_OF_DAENERYS, ACCOUNT_OF_JON, new BigDecimal("10000"));
-    moneyTransactionService.withdrawalMoney(ACCOUNT_OF_JON, new BigDecimal("1000"));
+    eventProcessor.process(new MoneyTransferEvent(
+        4, new Date().getTime(), new BigDecimal("10000"), ACCOUNT_OF_DAENERYS,
+        ACCOUNT_OF_JON));
 
     LOGGER.info("...............State:............");
     LOGGER.info(AccountAggregate.getAccount(ACCOUNT_OF_DAENERYS).toString());
@@ -93,13 +103,13 @@ public static void main(String[] args) {
 
     LOGGER.info("Recover the system by the events in journal file............");
 
-    domainEventProcessor = new DomainEventProcessor();
-    jsonFileJournal = new JsonFileJournal();
-    domainEventProcessor.setPrecessorJournal(jsonFileJournal);
-    domainEventProcessor.recover();
+    eventProcessor = new DomainEventProcessor();
+    eventProcessor.recover();
 
     LOGGER.info("...............Recovered State:............");
     LOGGER.info(AccountAggregate.getAccount(ACCOUNT_OF_DAENERYS).toString());
     LOGGER.info(AccountAggregate.getAccount(ACCOUNT_OF_JON).toString());
   }
+
+
 }