From f5ac3e17af45588cd9990dbee5e9005bf04d1ea0 Mon Sep 17 00:00:00 2001
From: Dominik Schadow <mail@dominikschadow.de>
Date: Sat, 14 Dec 2024 20:20:40 +0100
Subject: [PATCH] updated logger to slf4j

---
 .../javasecurity/contacts/ContactController.java            | 5 ++---
 .../javasecurity/downloads/DownloadController.java          | 5 ++---
 .../javasecurity/downloads/DownloadService.java             | 5 ++---
 security-logging/pom.xml                                    | 4 ++++
 .../javasecurity/logging/home/HomeController.java           | 6 ++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/access-control-spring-security/src/main/java/de/dominikschadow/javasecurity/contacts/ContactController.java b/access-control-spring-security/src/main/java/de/dominikschadow/javasecurity/contacts/ContactController.java
index 5dc50a85..0f43e88a 100644
--- a/access-control-spring-security/src/main/java/de/dominikschadow/javasecurity/contacts/ContactController.java
+++ b/access-control-spring-security/src/main/java/de/dominikschadow/javasecurity/contacts/ContactController.java
@@ -18,8 +18,7 @@
 package de.dominikschadow.javasecurity.contacts;
 
 import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -36,8 +35,8 @@
 @Controller
 @RequestMapping(value = "/contacts")
 @RequiredArgsConstructor
+@Slf4j
 public class ContactController {
-    private static final Logger log = LoggerFactory.getLogger(ContactController.class);
     private final ContactService contactService;
 
     @GetMapping
diff --git a/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadController.java b/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadController.java
index 9c7cbf62..4524b5aa 100644
--- a/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadController.java
+++ b/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadController.java
@@ -18,9 +18,8 @@
 package de.dominikschadow.javasecurity.downloads;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.owasp.esapi.errors.AccessControlException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -42,8 +41,8 @@
 @Controller
 @RequestMapping
 @RequiredArgsConstructor
+@Slf4j
 public class DownloadController {
-    private static final Logger log = LoggerFactory.getLogger(DownloadController.class);
     private final DownloadService downloadService;
 
     @GetMapping("/")
diff --git a/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadService.java b/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadService.java
index 76af6f26..1ef82775 100644
--- a/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadService.java
+++ b/direct-object-references/src/main/java/de/dominikschadow/javasecurity/downloads/DownloadService.java
@@ -18,10 +18,9 @@
 package de.dominikschadow.javasecurity.downloads;
 
 import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
 import org.owasp.esapi.errors.AccessControlException;
 import org.owasp.esapi.reference.RandomAccessReferenceMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
@@ -32,8 +31,8 @@
 import java.util.Set;
 
 @Service
+@Slf4j
 public class DownloadService {
-    private static final Logger log = LoggerFactory.getLogger(DownloadService.class);
     private final Set<Object> resources = new HashSet<>();
     private final RandomAccessReferenceMap referenceMap = new RandomAccessReferenceMap(resources);
     private final String rootLocation;
diff --git a/security-logging/pom.xml b/security-logging/pom.xml
index 67d68182..310d7cbd 100644
--- a/security-logging/pom.xml
+++ b/security-logging/pom.xml
@@ -43,6 +43,10 @@
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/security-logging/src/main/java/de/dominikschadow/javasecurity/logging/home/HomeController.java b/security-logging/src/main/java/de/dominikschadow/javasecurity/logging/home/HomeController.java
index a3f82fe7..93c4f51c 100644
--- a/security-logging/src/main/java/de/dominikschadow/javasecurity/logging/home/HomeController.java
+++ b/security-logging/src/main/java/de/dominikschadow/javasecurity/logging/home/HomeController.java
@@ -17,9 +17,8 @@
  */
 package de.dominikschadow.javasecurity.logging.home;
 
+import lombok.extern.slf4j.Slf4j;
 import org.owasp.security.logging.SecurityMarkers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,9 +30,8 @@
  * @author Dominik Schadow
  */
 @Controller
+@Slf4j
 public class HomeController {
-    private static final Logger log = LoggerFactory.getLogger(HomeController.class);
-
     @GetMapping("/")
     public String home(Model model) {
         model.addAttribute("login", new Login("", ""));