From 97ab7130240d8995a9710ce53c611d4e51044627 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Wed, 10 Jul 2019 13:27:50 +0200
Subject: [PATCH] Create dedicated UnconfirmedOrderException

Create a dedicated UnconfirmedOrderException and use it from the
 OrderAggregate instead of the IllegalStateException

BAEL-2435
---
 .../com/baeldung/axon/commandmodel/OrderAggregate.java    | 7 ++++---
 .../coreapi/exceptions/UnconfirmedOrderException.java     | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java

diff --git a/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java b/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
index b37b2fdd66..4ef02e6b54 100644
--- a/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
@@ -13,6 +13,7 @@ import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
 import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
 import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
 import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
 
 @Aggregate
 public class OrderAggregate {
@@ -34,7 +35,7 @@ public class OrderAggregate {
     @CommandHandler
     public void handle(ShipOrderCommand command) {
         if (!orderConfirmed) {
-            throw new IllegalStateException("Cannot ship an order which has not been confirmed yet.");
+            throw new UnconfirmedOrderException();
         }
 
         apply(new OrderShippedEvent(orderId));
@@ -43,12 +44,12 @@ public class OrderAggregate {
     @EventSourcingHandler
     public void on(OrderPlacedEvent event) {
         this.orderId = event.getOrderId();
-        orderConfirmed = false;
+        this.orderConfirmed = false;
     }
 
     @EventSourcingHandler
     public void on(OrderConfirmedEvent event) {
-        orderConfirmed = true;
+        this.orderConfirmed = true;
     }
 
     protected OrderAggregate() {
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java b/axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java
new file mode 100644
index 0000000000..1873bc6893
--- /dev/null
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java
@@ -0,0 +1,8 @@
+package com.baeldung.axon.coreapi.exceptions;
+
+public class UnconfirmedOrderException extends IllegalStateException {
+
+    public UnconfirmedOrderException() {
+        super("Cannot ship an order which has not been confirmed yet.");
+    }
+}