diff --git a/.gitignore b/.gitignore
index 6366460f0..4089836e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
.idea/*
*.iml
target/*
+*.logs
+app.log
diff --git a/pom.xml b/pom.xml
index d524faa08..8b0bb3ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,13 @@
jv-logger
1.0-SNAPSHOT
+
+
+ central
+ https://repo1.maven.org/maven2/
+
+
+
17
UTF-8
@@ -24,6 +31,16 @@
4.12
test
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.23.1
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.23.1
+
diff --git a/src/main/java/mate/academy/Main.java b/src/main/java/mate/academy/Main.java
index 085758fbf..afaa13929 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 login", 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..b1e20ad9f 100644
--- a/src/main/java/mate/academy/service/AuthenticationServiceImpl.java
+++ b/src/main/java/mate/academy/service/AuthenticationServiceImpl.java
@@ -2,11 +2,15 @@
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={}", login);
User user = findByLogin(login);
if (!user.getPassword().equals(password)) {
throw new AuthenticationException("Username or password are incorrect");
diff --git a/src/main/java/mate/academy/service/OrderServiceImpl.java b/src/main/java/mate/academy/service/OrderServiceImpl.java
index eeabe1555..aea4067ee 100644
--- a/src/main/java/mate/academy/service/OrderServiceImpl.java
+++ b/src/main/java/mate/academy/service/OrderServiceImpl.java
@@ -4,16 +4,21 @@
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
List products = getAllProductsFromShoppingCart(userId);
Order order = new Order(products, userId);
// NOTE: In production ready code this order identifier should be generated by DB
// For test purpose we simplify this and return dummy data
order.setOrderId(1L);
+ logger.info("Method completeOrder was called. Params: userId={}, products={}, "
+ + "orderId={}", userId, products.size(), order.getOrderId());
return order;
}
@@ -24,7 +29,8 @@ 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.info("Successful fetched data. Params: userId={}, products={}",
+ userId, products);
return products;
}
}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..b66d5311b
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+ %d %p %c:%L %m%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+