From 0c86c2a97fcfb9ff6d0006b5cd0369b8b421739d Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 30 Oct 2024 13:28:14 +0000 Subject: [PATCH 1/2] Feat: Adds Shawn Dunsmore Jr Lesson14 Handling Exceptions. --- .../lesson14/ecommerce/EcommerceSystem.java | 12 +++++++++--- .../lesson14/ecommerce/OrderNotFoundException.java | 6 +++++- .../lesson14/ecommerce/ProductNotFoundException.java | 6 +++++- .../lesson14/ecommerce/EcommerceSystemTest.java | 1 - 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java index 77cf26937..153350d8b 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java @@ -17,19 +17,25 @@ public void addProduct(String productId, String name) { products.put(productId, new Product(productId, name)); } - public String placeOrder(String productId, int quantity) { + public String placeOrder(String productId, int quantity) throws ProductNotFoundException { Product product = products.get(productId); + if (product == null){ + throw new ProductNotFoundException("Product with ID "+ productId +" not found"); + } String orderId = UUID.randomUUID().toString(); orders.put(orderId, new Order(orderId, product, quantity)); return orderId; } - public void cancelOrder(String orderId) { + public void cancelOrder(String orderId){ orders.remove(orderId); } - public String checkOrderStatus(String orderId) { + public String checkOrderStatus(String orderId) throws OrderNotFoundException { Order order = orders.get(orderId); + if (order == null){ + throw new OrderNotFoundException("Order with ID "+ orderId+ " not found"); + } return "Order ID: " + orderId + ", Product: " diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java index 0104e0ab8..fbcafa852 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java @@ -5,4 +5,8 @@ package com.codedifferently.lesson14.ecommerce; -class OrderNotFoundException {} +class OrderNotFoundException extends Exception { + public OrderNotFoundException(String message) { + super(message); + } +} diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java index 25aa814eb..135c65f04 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java @@ -5,4 +5,8 @@ package com.codedifferently.lesson14.ecommerce; -class ProductNotFoundException {} +class ProductNotFoundException extends Exception { + public ProductNotFoundException(String message) { + super(message); + } +} diff --git a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java index 52194dfa3..2f936dbd9 100644 --- a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java +++ b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; From 878e8f4685794a44cb51352ef1219844ff4e90c0 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 30 Oct 2024 13:34:18 +0000 Subject: [PATCH 2/2] Feat: Adds Shawn Dunsmore Jr Lesson14 Fix SpotlessApply --- .../lesson14/ecommerce/EcommerceSystem.java | 10 +++++----- .../lesson14/ecommerce/OrderNotFoundException.java | 6 +++--- .../lesson14/ecommerce/ProductNotFoundException.java | 6 +++--- .../lesson14/ecommerce/EcommerceSystemTest.java | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java index 153350d8b..b0ebe1151 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java @@ -19,22 +19,22 @@ public void addProduct(String productId, String name) { public String placeOrder(String productId, int quantity) throws ProductNotFoundException { Product product = products.get(productId); - if (product == null){ - throw new ProductNotFoundException("Product with ID "+ productId +" not found"); + if (product == null) { + throw new ProductNotFoundException("Product with ID " + productId + " not found"); } String orderId = UUID.randomUUID().toString(); orders.put(orderId, new Order(orderId, product, quantity)); return orderId; } - public void cancelOrder(String orderId){ + public void cancelOrder(String orderId) { orders.remove(orderId); } public String checkOrderStatus(String orderId) throws OrderNotFoundException { Order order = orders.get(orderId); - if (order == null){ - throw new OrderNotFoundException("Order with ID "+ orderId+ " not found"); + if (order == null) { + throw new OrderNotFoundException("Order with ID " + orderId + " not found"); } return "Order ID: " + orderId diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java index fbcafa852..50607ed33 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java @@ -6,7 +6,7 @@ package com.codedifferently.lesson14.ecommerce; class OrderNotFoundException extends Exception { - public OrderNotFoundException(String message) { - super(message); - } + public OrderNotFoundException(String message) { + super(message); + } } diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java index 135c65f04..196ac84ac 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java @@ -6,7 +6,7 @@ package com.codedifferently.lesson14.ecommerce; class ProductNotFoundException extends Exception { - public ProductNotFoundException(String message) { - super(message); - } + public ProductNotFoundException(String message) { + super(message); + } } diff --git a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java index 2f936dbd9..52194dfa3 100644 --- a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java +++ b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;