From be83c8de4841a0b40757d6a7d3585c1bcd846547 Mon Sep 17 00:00:00 2001 From: Kotangora1 Date: Fri, 25 Oct 2024 23:53:34 +0000 Subject: [PATCH 1/4] feat: adding exception in lesson14 homework by Yemi --- .../lesson14/ecommerce/EcommerceSystem.java | 17 ++++++++++++++--- .../ecommerce/OrderNotFoundException.java | 6 +++++- .../ecommerce/ProductNotFoundException.java | 6 +++++- 3 files changed, 24 insertions(+), 5 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..e2f3cd5a3 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,30 @@ 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, Exception { Product product = products.get(productId); + if (product == null) { + throw new ProductNotFoundException("Product with ID 1 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) throws OrderNotFoundException { + Order order = orders.get(orderId); + try { + if (order == null) throw new OrderNotFoundException("Such Order does not exist"); + } catch (OrderNotFoundException e) { + System.out.println(" Order does not exist"); + } 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 1 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..e4eb0a668 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 RuntimeException { + 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..9b1180214 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 RuntimeException { + public ProductNotFoundException(String message) { + super(message); + } +} From 2264a0cc5390b471e579f83fe371a74c6ad5e6fe Mon Sep 17 00:00:00 2001 From: Kotangora1 Date: Sat, 26 Oct 2024 00:23:57 +0000 Subject: [PATCH 2/4] feat: removed unneccessary exception in lesson14 homework by Yemi --- .../codedifferently/lesson14/ecommerce/EcommerceSystem.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 e2f3cd5a3..8677660f8 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,8 +17,7 @@ public void addProduct(String productId, String name) { products.put(productId, new Product(productId, name)); } - public String placeOrder(String productId, int quantity) - throws ProductNotFoundException, Exception { + public String placeOrder(String productId, int quantity) throws ProductNotFoundException { Product product = products.get(productId); if (product == null) { throw new ProductNotFoundException("Product with ID 1 not found"); From a17007a40dbd16aa26c2d88cde92b6c73351d249 Mon Sep 17 00:00:00 2001 From: Kotangora1 Date: Sun, 27 Oct 2024 21:33:50 +0000 Subject: [PATCH 3/4] feat: updated exception in lesson14 homework by Yemi --- .../lesson14/ecommerce/EcommerceSystem.java | 7 ++++--- .../lesson14/ecommerce/OrderNotFoundException.java | 5 ----- .../lesson14/ecommerce/ProductNotFoundException.java | 5 ----- 3 files changed, 4 insertions(+), 13 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 8677660f8..e4f81afcf 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 @@ -20,7 +20,7 @@ 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 1 not found"); + throw new ProductNotFoundException("Product with ID " + productId + " not found"); } String orderId = UUID.randomUUID().toString(); orders.put(orderId, new Order(orderId, product, quantity)); @@ -30,9 +30,10 @@ public String placeOrder(String productId, int quantity) throws ProductNotFoundE public void cancelOrder(String orderId) throws OrderNotFoundException { Order order = orders.get(orderId); try { - if (order == null) throw new OrderNotFoundException("Such Order does not exist"); + if (order == null) + throw new OrderNotFoundException("Order with order ID " + orderId + " does not exist"); } catch (OrderNotFoundException e) { - System.out.println(" Order does not exist"); + System.out.println("Order with order ID " + orderId + " does not exist"); } orders.remove(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 e4eb0a668..90bccf1d2 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 @@ -1,8 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ - package com.codedifferently.lesson14.ecommerce; class OrderNotFoundException extends RuntimeException { 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 9b1180214..ac8b25271 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 @@ -1,8 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ - package com.codedifferently.lesson14.ecommerce; class ProductNotFoundException extends RuntimeException { From 1abc10180b6217dc2d38bcc177763f9528e5ce1c Mon Sep 17 00:00:00 2001 From: Kotangora1 Date: Sun, 27 Oct 2024 21:42:09 +0000 Subject: [PATCH 4/4] feat: updated exception in lesson14 homework by Yemi --- .../com/codedifferently/lesson14/ecommerce/EcommerceSystem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e4f81afcf..53ee6e028 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 @@ -40,7 +40,7 @@ public void cancelOrder(String orderId) throws OrderNotFoundException { public String checkOrderStatus(String orderId) throws OrderNotFoundException { Order order = orders.get(orderId); - if (order == null) throw new OrderNotFoundException("Order with ID 1 not found"); + if (order == null) throw new OrderNotFoundException("Order with ID " + orderId + " not found"); return "Order ID: " + orderId + ", Product: "