From 89150859a255edca85c5801b69eec64f52b14810 Mon Sep 17 00:00:00 2001 From: Official Nlas Date: Fri, 29 May 2026 17:31:22 +0200 Subject: [PATCH 1/2] done --- .gitignore | 1 + pom.xml | 24 ++++++++++++++++++- src/main/java/mate/academy/Main.java | 6 ++++- .../service/AuthenticationServiceImpl.java | 8 +++++-- .../academy/service/OrderServiceImpl.java | 9 +++++-- src/main/resources/log4j2.xml | 23 ++++++++++++++++++ 6 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/log4j2.xml diff --git a/.gitignore b/.gitignore index 6366460f0..bb04aae6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea/* *.iml target/* +logs/* diff --git a/pom.xml b/pom.xml index d524faa08..4b67b49d2 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,18 @@ + + + + org.apache.logging.log4j + log4j-bom + 2.26.0 + pom + import + + + + junit @@ -24,7 +36,18 @@ 4.12 test + + + org.apache.logging.log4j + log4j-api + + + + org.apache.logging.log4j + log4j-core + + @@ -63,4 +86,3 @@ - diff --git a/src/main/java/mate/academy/Main.java b/src/main/java/mate/academy/Main.java index 085758fbf..662cfa0ad 100644 --- a/src/main/java/mate/academy/Main.java +++ b/src/main/java/mate/academy/Main.java @@ -6,15 +6,19 @@ import mate.academy.service.AuthenticationServiceImpl; import mate.academy.service.OrderService; import mate.academy.service.OrderServiceImpl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Main { + private static final Logger logger = LogManager.getLogger(Main.class); + public static void main(String[] args) { AuthenticationService authenticationService = new AuthenticationServiceImpl(); User user; try { user = authenticationService.login("bob", "1234"); } catch (AuthenticationException e) { - e.printStackTrace(); + logger.error("Can't aunthificate user. ", e); ; return; } OrderService orderService = new OrderServiceImpl(); diff --git a/src/main/java/mate/academy/service/AuthenticationServiceImpl.java b/src/main/java/mate/academy/service/AuthenticationServiceImpl.java index f9fe83b70..a03001fae 100644 --- a/src/main/java/mate/academy/service/AuthenticationServiceImpl.java +++ b/src/main/java/mate/academy/service/AuthenticationServiceImpl.java @@ -2,14 +2,18 @@ import mate.academy.exception.AuthenticationException; import mate.academy.model.User; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class AuthenticationServiceImpl implements AuthenticationService { + private static final Logger logger = LogManager.getLogger(AuthenticationServiceImpl.class); + @Override public User login(String login, String password) throws AuthenticationException { - //TODO: add corresponding log message about method login was called + logger.info("Method login was called. Params = {}", login); User user = findByLogin(login); if (!user.getPassword().equals(password)) { - throw new AuthenticationException("Username or password are incorrect"); + logger.error("Username or password are incorrect : login = {}", user.getLogin()); } return user; } diff --git a/src/main/java/mate/academy/service/OrderServiceImpl.java b/src/main/java/mate/academy/service/OrderServiceImpl.java index eeabe1555..c185731ed 100644 --- a/src/main/java/mate/academy/service/OrderServiceImpl.java +++ b/src/main/java/mate/academy/service/OrderServiceImpl.java @@ -4,11 +4,16 @@ import java.util.List; import mate.academy.model.Order; import mate.academy.model.Product; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class OrderServiceImpl implements OrderService { + private static final Logger logger = LogManager.getLogger(OrderServiceImpl.class); + @Override public Order completeOrder(Long userId) { - // TODO: add log message about method completeOrder was called + logger.info("Method completeOrder was called."); + List products = getAllProductsFromShoppingCart(userId); Order order = new Order(products, userId); // NOTE: In production ready code this order identifier should be generated by DB @@ -24,7 +29,7 @@ private List getAllProductsFromShoppingCart(Long userId) { Product macBook = new Product("MacBook Air 2020", BigDecimal.valueOf(1399)); Product xiaomi = new Product("Xiaomi 12", BigDecimal.valueOf(499)); List products = List.of(iphone, macBook, xiaomi); - // TODO: add log message about successful fetched data from DB + logger.error("Data successfully fetched from DB. Table : {}", Product.class.getName()); return products; } } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 000000000..0e1552bbb --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,23 @@ + + + + + + + + + %d %p %c:%L %m%n + + + + + + + + + + + + + + From 3e5bbe0b0dbdf1e02689b811081ab54157f22087 Mon Sep 17 00:00:00 2001 From: Official Nlas Date: Fri, 29 May 2026 17:36:25 +0200 Subject: [PATCH 2/2] done --- src/main/java/mate/academy/Main.java | 2 +- src/main/java/mate/academy/service/OrderServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/Main.java b/src/main/java/mate/academy/Main.java index 662cfa0ad..0e88deb5c 100644 --- a/src/main/java/mate/academy/Main.java +++ b/src/main/java/mate/academy/Main.java @@ -18,7 +18,7 @@ public static void main(String[] args) { try { user = authenticationService.login("bob", "1234"); } catch (AuthenticationException e) { - logger.error("Can't aunthificate user. ", e); ; + logger.error("Can't aunthificate user. ", e); return; } OrderService orderService = new OrderServiceImpl(); diff --git a/src/main/java/mate/academy/service/OrderServiceImpl.java b/src/main/java/mate/academy/service/OrderServiceImpl.java index c185731ed..c9cd0b2ad 100644 --- a/src/main/java/mate/academy/service/OrderServiceImpl.java +++ b/src/main/java/mate/academy/service/OrderServiceImpl.java @@ -12,7 +12,7 @@ public class OrderServiceImpl implements OrderService { @Override public Order completeOrder(Long userId) { - logger.info("Method completeOrder was called."); + logger.info("Method completeOrder was called.Params = {}", userId); List products = getAllProductsFromShoppingCart(userId); Order order = new Order(products, userId); @@ -29,7 +29,7 @@ private List getAllProductsFromShoppingCart(Long userId) { Product macBook = new Product("MacBook Air 2020", BigDecimal.valueOf(1399)); Product xiaomi = new Product("Xiaomi 12", BigDecimal.valueOf(499)); List products = List.of(iphone, macBook, xiaomi); - logger.error("Data successfully fetched from DB. Table : {}", Product.class.getName()); + logger.info("Data successfully fetched from DB. Table : {}", Product.class.getName()); return products; } }