diff --git a/axon/src/main/java/com/baeldung/axon/gui/MessagesRestEndpoint.java b/axon/src/main/java/com/baeldung/axon/gui/MessagesRestEndpoint.java
deleted file mode 100644
index ddbc3e2fc5..0000000000
--- a/axon/src/main/java/com/baeldung/axon/gui/MessagesRestEndpoint.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung.axon.gui;
-
-import java.util.UUID;
-
-import org.axonframework.commandhandling.gateway.CommandGateway;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baeldung.axon.coreapi.commands.CreateMessageCommand;
-import com.baeldung.axon.coreapi.commands.MarkReadMessageCommand;
-
-@RestController
-public class MessagesRestEndpoint {
-
-    private final CommandGateway commandGateway;
-
-    public MessagesRestEndpoint(CommandGateway commandGateway) {
-        this.commandGateway = commandGateway;
-    }
-
-    @PostMapping("/hello")
-    public void publishMessages() {
-        final String itemId = UUID.randomUUID().toString();
-        commandGateway.send(new CreateMessageCommand(itemId, "Hello, how is your day? :-)"));
-        commandGateway.send(new MarkReadMessageCommand(itemId));
-    }
-
-}
diff --git a/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
new file mode 100644
index 0000000000..3c86f9c3b1
--- /dev/null
+++ b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
@@ -0,0 +1,40 @@
+package com.baeldung.axon.gui;
+
+import java.util.UUID;
+
+import org.axonframework.commandhandling.gateway.CommandGateway;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
+import com.baeldung.axon.coreapi.commands.PlaceOrderCommand;
+import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
+
+@RestController
+public class OrderRestEndpoint {
+
+    private static final String DEFAULT_PRODUCT = "Deluxe Chair";
+
+    private final CommandGateway commandGateway;
+
+    public OrderRestEndpoint(CommandGateway commandGateway) {
+        this.commandGateway = commandGateway;
+    }
+
+    @PostMapping("/ship-order")
+    public void shipOrder() {
+        String orderId = UUID.randomUUID().toString();
+        commandGateway.send(new PlaceOrderCommand(orderId, DEFAULT_PRODUCT));
+        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));
+        // This throws an exception, as an Order cannot be shipped if it has not been confirmed yet.
+        commandGateway.send(new ShipOrderCommand(orderId));
+    }
+
+}