diff --git a/.gitignore b/.gitignore
index 6366460f0..b649896f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
.idea/*
*.iml
target/*
+logs/*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d524faa08..0465199e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,15 @@
- junit
- junit
- 4.12
- test
+ org.apache.logging.log4j
+ log4j-core
+ 2.25.4
+
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.25.4
diff --git a/src/main/java/mate/academy/Main.java b/src/main/java/mate/academy/Main.java
index 085758fbf..1976b99aa 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();
+
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("User authentication was failed. Params: login - {}", "bob", 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..69725c61e 100644
--- a/src/main/java/mate/academy/service/AuthenticationServiceImpl.java
+++ b/src/main/java/mate/academy/service/AuthenticationServiceImpl.java
@@ -2,11 +2,16 @@
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();
+
@Override
public User login(String login, String password) throws AuthenticationException {
- //TODO: add corresponding log message about method login was called
+ LOGGER.info("Login method 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..3eeccc8d6 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();
+
@Override
public Order completeOrder(Long userId) {
- // TODO: add log message about method completeOrder was called
+ LOGGER.info("completeOrder method was called. Params: userId - {}", userId);
+
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,9 @@ 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("Data from DB was successfully fetched. Params: userId - {}", userId);
+
return products;
}
}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..ca91ff37d
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%t] %-5level %logger{36}:%L - %msg%n
+
+
+
+
+ %d{HH:mm:ss.SSS} [%t] %-5level %logger{36}:%L - %msg%n
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file