BAEL-2435 Minor clean ups

smcvb · smcvb · commit 03306112bdc1 · 2018-12-28T15:58:41.000+01:00
-Add toString() function to messages/query-model
-Fix typo in exception
-Reorder event handlers in OrderedProductsEventHandler
-Replace usage of constants for local fields
-Add missing Aggregate test case
diff --git a/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java b/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
@@ -34,7 +34,7 @@ public void handle(ConfirmOrderCommand command) {
     @CommandHandler
     public void handle(ShipOrderCommand command) {
         if (!orderConfirmed) {
-            throw new IllegalStateException("Cannot ship an order which has not ben confirmed yet.");
+            throw new IllegalStateException("Cannot ship an order which has not been confirmed yet.");
         }
 
         apply(new OrderShippedEvent(orderId));
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/ConfirmOrderCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/ConfirmOrderCommand.java
@@ -33,4 +33,11 @@ public boolean equals(Object obj) {
         final ConfirmOrderCommand other = (ConfirmOrderCommand) obj;
         return Objects.equals(this.orderId, other.orderId);
     }
+
+    @Override
+    public String toString() {
+        return "ConfirmOrderCommand{" +
+                "orderId='" + orderId + '\'' +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/PlaceOrderCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/PlaceOrderCommand.java
@@ -40,4 +40,12 @@ public boolean equals(Object obj) {
         return Objects.equals(this.orderId, other.orderId)
                 && Objects.equals(this.product, other.product);
     }
+
+    @Override
+    public String toString() {
+        return "PlaceOrderCommand{" +
+                "orderId='" + orderId + '\'' +
+                ", product='" + product + '\'' +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/ShipOrderCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/ShipOrderCommand.java
@@ -33,4 +33,11 @@ public boolean equals(Object obj) {
         final ShipOrderCommand other = (ShipOrderCommand) obj;
         return Objects.equals(this.orderId, other.orderId);
     }
+
+    @Override
+    public String toString() {
+        return "ShipOrderCommand{" +
+                "orderId='" + orderId + '\'' +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderConfirmedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderConfirmedEvent.java
@@ -30,4 +30,11 @@ public boolean equals(Object obj) {
         final OrderConfirmedEvent other = (OrderConfirmedEvent) obj;
         return Objects.equals(this.orderId, other.orderId);
     }
+
+    @Override
+    public String toString() {
+        return "OrderConfirmedEvent{" +
+                "orderId='" + orderId + '\'' +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderPlacedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderPlacedEvent.java
@@ -37,4 +37,12 @@ public boolean equals(Object obj) {
         return Objects.equals(this.orderId, other.orderId)
                 && Objects.equals(this.product, other.product);
     }
+
+    @Override
+    public String toString() {
+        return "OrderPlacedEvent{" +
+                "orderId='" + orderId + '\'' +
+                ", product='" + product + '\'' +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderShippedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderShippedEvent.java
@@ -30,4 +30,11 @@ public boolean equals(Object obj) {
         final OrderShippedEvent other = (OrderShippedEvent) obj;
         return Objects.equals(this.orderId, other.orderId);
     }
+
+    @Override
+    public String toString() {
+        return "OrderShippedEvent{" +
+                "orderId='" + orderId + '\'' +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderedProduct.java b/axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderedProduct.java
@@ -52,4 +52,13 @@ public boolean equals(Object obj) {
                 && Objects.equals(this.product, other.product)
                 && Objects.equals(this.orderStatus, other.orderStatus);
     }
+
+    @Override
+    public String toString() {
+        return "OrderedProduct{" +
+                "orderId='" + orderId + '\'' +
+                ", product='" + product + '\'' +
+                ", orderStatus=" + orderStatus +
+                '}';
+    }
 }
diff --git a/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
@@ -19,8 +19,6 @@
 @RestController
 public class OrderRestEndpoint {
 
-    private static final String DEFAULT_PRODUCT = "Deluxe Chair";
-
     private final CommandGateway commandGateway;
     private final QueryGateway queryGateway;
 
@@ -32,23 +30,23 @@ public OrderRestEndpoint(CommandGateway commandGateway, QueryGateway queryGatewa
     @PostMapping("/ship-order")
     public void shipOrder() {
         String orderId = UUID.randomUUID().toString();
-        commandGateway.send(new PlaceOrderCommand(orderId, DEFAULT_PRODUCT));
+        commandGateway.send(new PlaceOrderCommand(orderId, "Deluxe Chair"));
         commandGateway.send(new ConfirmOrderCommand(orderId));
         commandGateway.send(new ShipOrderCommand(orderId));
     }
 
     @PostMapping("/ship-unconfirmed-order")
     public void shipUnconfirmedOrder() {
         String orderId = UUID.randomUUID().toString();
-        commandGateway.send(new PlaceOrderCommand(orderId, DEFAULT_PRODUCT));
+        commandGateway.send(new PlaceOrderCommand(orderId, "Deluxe Chair"));
         // This throws an exception, as an Order cannot be shipped if it has not been confirmed yet.
         commandGateway.send(new ShipOrderCommand(orderId));
     }
 
     @GetMapping("/all-orders")
     public List<OrderedProduct> findAllOrderedProducts() {
         return queryGateway.query(new FindAllOrderedProductsQuery(), ResponseTypes.multipleInstancesOf(OrderedProduct.class))
-            .join();
+                           .join();
     }
 
 }
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
@@ -24,21 +24,20 @@ public class OrderedProductsEventHandler {
     public void on(OrderPlacedEvent event) {
         String orderId = event.getOrderId();
         orderedProducts.put(orderId, new OrderedProduct(orderId, event.getProduct()));
-
     }
 
     @EventHandler
-    public void on(OrderShippedEvent event) {
+    public void on(OrderConfirmedEvent event) {
         orderedProducts.computeIfPresent(event.getOrderId(), (orderId, orderedProduct) -> {
-            orderedProduct.setOrderShipped();
+            orderedProduct.setOrderConfirmed();
             return orderedProduct;
         });
     }
 
     @EventHandler
-    public void on(OrderConfirmedEvent event) {
+    public void on(OrderShippedEvent event) {
         orderedProducts.computeIfPresent(event.getOrderId(), (orderId, orderedProduct) -> {
-            orderedProduct.setOrderConfirmed();
+            orderedProduct.setOrderShipped();
             return orderedProduct;
         });
     }
diff --git a/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java b/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
@@ -6,6 +6,7 @@
 import org.axonframework.test.aggregate.FixtureConfiguration;
 import org.junit.*;
 
+import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
 import com.baeldung.axon.coreapi.commands.PlaceOrderCommand;
 import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
 import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
@@ -14,9 +15,6 @@
 
 public class OrderAggregateUnitTest {
 
-    private static final String ORDER_ID = UUID.randomUUID().toString();
-    private static final String DEFAULT_PRODUCT = "Deluxe Chair";
-
     private FixtureConfiguration<OrderAggregate> fixture;
 
     @Before
@@ -26,23 +24,38 @@ public void setUp() {
 
     @Test
     public void giveNoPriorActivity_whenPlaceOrderCommand_thenShouldPublishOrderPlacedEvent() {
+        String orderId = UUID.randomUUID().toString();
+        String product = "Deluxe Chair";
         fixture.givenNoPriorActivity()
-               .when(new PlaceOrderCommand(ORDER_ID, DEFAULT_PRODUCT))
-               .expectEvents(new OrderPlacedEvent(ORDER_ID, DEFAULT_PRODUCT));
+               .when(new PlaceOrderCommand(orderId, product))
+               .expectEvents(new OrderPlacedEvent(orderId, product));
+    }
+
+    @Test
+    public void givenOrderPlacedEvent_whenConfirmOrderCommand_thenShouldPublishOrderConfirmedEvent() {
+        String orderId = UUID.randomUUID().toString();
+        String product = "Deluxe Chair";
+        fixture.given(new OrderPlacedEvent(orderId, product))
+               .when(new ConfirmOrderCommand(orderId))
+               .expectEvents(new OrderConfirmedEvent(orderId));
     }
 
     @Test
     public void givenOrderPlacedEvent_whenShipOrderCommand_thenShouldThrowIllegalStateException() {
-        fixture.given(new OrderPlacedEvent(ORDER_ID, DEFAULT_PRODUCT))
-               .when(new ShipOrderCommand(ORDER_ID))
+        String orderId = UUID.randomUUID().toString();
+        String product = "Deluxe Chair";
+        fixture.given(new OrderPlacedEvent(orderId, product))
+               .when(new ShipOrderCommand(orderId))
                .expectException(IllegalStateException.class);
     }
 
     @Test
     public void givenOrderPlacedEventAndOrderConfirmedEvent_whenShipOrderCommand_thenShouldPublishOrderShippedEvent() {
-        fixture.given(new OrderPlacedEvent(ORDER_ID, DEFAULT_PRODUCT), new OrderConfirmedEvent(ORDER_ID))
-               .when(new ShipOrderCommand(ORDER_ID))
-               .expectEvents(new OrderShippedEvent(ORDER_ID));
+        String orderId = UUID.randomUUID().toString();
+        String product = "Deluxe Chair";
+        fixture.given(new OrderPlacedEvent(orderId, product), new OrderConfirmedEvent(orderId))
+               .when(new ShipOrderCommand(orderId))
+               .expectEvents(new OrderShippedEvent(orderId));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void handle(ConfirmOrderCommand command) {`
`34`	`34`	`@CommandHandler`
`35`	`35`	`public void handle(ShipOrderCommand command) {`
`36`	`36`	`if (!orderConfirmed) {`
`37`		`- throw new IllegalStateException("Cannot ship an order which has not ben confirmed yet.");`
	`37`	`+ throw new IllegalStateException("Cannot ship an order which has not been confirmed yet.");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`apply(new OrderShippedEvent(orderId));`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,11 @@ public boolean equals(Object obj) {`
`33`	`33`	`final ConfirmOrderCommand other = (ConfirmOrderCommand) obj;`
`34`	`34`	`return Objects.equals(this.orderId, other.orderId);`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ @Override`
	`38`	`+ public String toString() {`
	`39`	`+ return "ConfirmOrderCommand{" +`
	`40`	`+ "orderId='" + orderId + '\'' +`
	`41`	`+ '}';`
	`42`	`+ }`
`36`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,12 @@ public boolean equals(Object obj) {`
`40`	`40`	`return Objects.equals(this.orderId, other.orderId)`
`41`	`41`	`&& Objects.equals(this.product, other.product);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ @Override`
	`45`	`+ public String toString() {`
	`46`	`+ return "PlaceOrderCommand{" +`
	`47`	`+ "orderId='" + orderId + '\'' +`
	`48`	`+ ", product='" + product + '\'' +`
	`49`	`+ '}';`
	`50`	`+ }`
`43`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,11 @@ public boolean equals(Object obj) {`
`30`	`30`	`final OrderConfirmedEvent other = (OrderConfirmedEvent) obj;`
`31`	`31`	`return Objects.equals(this.orderId, other.orderId);`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ @Override`
	`35`	`+ public String toString() {`
	`36`	`+ return "OrderConfirmedEvent{" +`
	`37`	`+ "orderId='" + orderId + '\'' +`
	`38`	`+ '}';`
	`39`	`+ }`
`33`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,12 @@ public boolean equals(Object obj) {`
`37`	`37`	`return Objects.equals(this.orderId, other.orderId)`
`38`	`38`	`&& Objects.equals(this.product, other.product);`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ @Override`
	`42`	`+ public String toString() {`
	`43`	`+ return "OrderPlacedEvent{" +`
	`44`	`+ "orderId='" + orderId + '\'' +`
	`45`	`+ ", product='" + product + '\'' +`
	`46`	`+ '}';`
	`47`	`+ }`
`40`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,13 @@ public boolean equals(Object obj) {`
`52`	`52`	`&& Objects.equals(this.product, other.product)`
`53`	`53`	`&& Objects.equals(this.orderStatus, other.orderStatus);`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ @Override`
	`57`	`+ public String toString() {`
	`58`	`+ return "OrderedProduct{" +`
	`59`	`+ "orderId='" + orderId + '\'' +`
	`60`	`+ ", product='" + product + '\'' +`
	`61`	`+ ", orderStatus=" + orderStatus +`
	`62`	`+ '}';`
	`63`	`+ }`
`55`	`64`	`}`