From e1e7eae162c558b3e10d5ad17985cfd5d569c025 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Sun, 21 Sep 2025 09:20:24 +0300 Subject: [PATCH 1/5] Annotate LogViewModel with Lombok @Getter and @Setter annotations --- .../invoice/model/view/LogViewModel.java | 44 +++---------------- 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/view/LogViewModel.java b/src/main/java/bg/softuni/invoice/model/view/LogViewModel.java index 158f690..4174596 100644 --- a/src/main/java/bg/softuni/invoice/model/view/LogViewModel.java +++ b/src/main/java/bg/softuni/invoice/model/view/LogViewModel.java @@ -1,7 +1,12 @@ package bg.softuni.invoice.model.view; +import lombok.Getter; +import lombok.Setter; + import java.time.LocalDateTime; +@Setter +@Getter public class LogViewModel { private String id; @@ -10,43 +15,4 @@ public class LogViewModel { private LocalDateTime dateTime; private String user; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRequestURI() { - return requestURI; - } - - public void setRequestURI(String requestURI) { - this.requestURI = requestURI; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - - public LocalDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } } From 0f71b5feeca08139df66be03ea9da0f9d4313407 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Sun, 21 Sep 2025 09:20:39 +0300 Subject: [PATCH 2/5] Annotate LogServiceModel with Lombok @Getter, @Setter, and @NoArgsConstructor annotations --- .../model/service/LogServiceModel.java | 49 +++---------------- 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/service/LogServiceModel.java b/src/main/java/bg/softuni/invoice/model/service/LogServiceModel.java index b991a51..e029df9 100644 --- a/src/main/java/bg/softuni/invoice/model/service/LogServiceModel.java +++ b/src/main/java/bg/softuni/invoice/model/service/LogServiceModel.java @@ -1,7 +1,14 @@ package bg.softuni.invoice.model.service; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import java.time.LocalDateTime; +@Setter +@Getter +@NoArgsConstructor public class LogServiceModel { private String id; @@ -10,9 +17,6 @@ public class LogServiceModel { private LocalDateTime dateTime; private UserServiceModel user; - public LogServiceModel() { - } - public LogServiceModel(String requestURI, String method, LocalDateTime dateTime, UserServiceModel user) { this.requestURI = requestURI; this.method = method; @@ -20,43 +24,4 @@ public LogServiceModel(String requestURI, String method, LocalDateTime dateTime, this.user = user; } - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRequestURI() { - return requestURI; - } - - public void setRequestURI(String requestURI) { - this.requestURI = requestURI; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - - public LocalDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; - } - - public UserServiceModel getUser() { - return user; - } - - public void setUser(UserServiceModel user) { - this.user = user; - } } From 6aaacbbbcad89eb877c72bd2c53c024e61bb68c2 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Sun, 21 Sep 2025 09:21:04 +0300 Subject: [PATCH 3/5] Annotate LogServiceImpl with Lombok @RequiredArgsConstructor annotation --- .../bg/softuni/invoice/service/impl/LogServiceImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/service/impl/LogServiceImpl.java b/src/main/java/bg/softuni/invoice/service/impl/LogServiceImpl.java index 1226400..b940187 100644 --- a/src/main/java/bg/softuni/invoice/service/impl/LogServiceImpl.java +++ b/src/main/java/bg/softuni/invoice/service/impl/LogServiceImpl.java @@ -4,24 +4,19 @@ import bg.softuni.invoice.model.service.LogServiceModel; import bg.softuni.invoice.repository.LogRepository; import bg.softuni.invoice.service.LogService; +import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @Service +@RequiredArgsConstructor public class LogServiceImpl implements LogService { private final LogRepository logRepository; private final ModelMapper modelMapper; - @Autowired - public LogServiceImpl(LogRepository logRepository, ModelMapper modelMapper) { - this.logRepository = logRepository; - this.modelMapper = modelMapper; - } - @Override public void createLog(LogServiceModel logServiceModel) { Log log = this.modelMapper.map(logServiceModel, Log.class); From 0d6a100a8dbe4be2d541313baa13d4401e819885 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Sun, 21 Sep 2025 09:21:26 +0300 Subject: [PATCH 4/5] Annotate LoggingInterceptor with Lombok @RequiredArgsConstructor annotation --- .../web/interceptor/LoggingInterceptor.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/web/interceptor/LoggingInterceptor.java b/src/main/java/bg/softuni/invoice/web/interceptor/LoggingInterceptor.java index 460e6b6..37edd70 100644 --- a/src/main/java/bg/softuni/invoice/web/interceptor/LoggingInterceptor.java +++ b/src/main/java/bg/softuni/invoice/web/interceptor/LoggingInterceptor.java @@ -4,34 +4,26 @@ import bg.softuni.invoice.model.service.UserServiceModel; import bg.softuni.invoice.service.LogService; import bg.softuni.invoice.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.security.servlet.PathRequest; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import static bg.softuni.invoice.constant.GlobalConstants.ANONYMOUS_USER_USERNAME; @Component +@RequiredArgsConstructor public class LoggingInterceptor implements HandlerInterceptor { private final LogService logService; private final UserService userService; - @Autowired - public LoggingInterceptor(LogService logService, UserService userService) { - this.logService = logService; - this.userService = userService; - } - @Override - public boolean preHandle(HttpServletRequest request, - HttpServletResponse response, - Object handler) throws Exception { - + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { String requestURI = request.getRequestURI(); String method = request.getMethod(); String username = request.getUserPrincipal() == null From ab1a715a4f7929a618ace8ee0eed893b0d28dd05 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Sun, 21 Sep 2025 09:21:58 +0300 Subject: [PATCH 5/5] Annotate LogRestController with Lombok @RequiredArgsConstructor annotation --- .../invoice/web/controller/LogRestController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/web/controller/LogRestController.java b/src/main/java/bg/softuni/invoice/web/controller/LogRestController.java index 3e2611e..e610810 100644 --- a/src/main/java/bg/softuni/invoice/web/controller/LogRestController.java +++ b/src/main/java/bg/softuni/invoice/web/controller/LogRestController.java @@ -2,10 +2,14 @@ import bg.softuni.invoice.model.entity.Log; import bg.softuni.invoice.repository.LogRepository; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Optional; @@ -13,15 +17,11 @@ @CrossOrigin("http://localhost") @RestController @RequestMapping("/api/log") +@RequiredArgsConstructor public class LogRestController { private final LogRepository logRepository; - @Autowired - public LogRestController(LogRepository logRepository) { - this.logRepository = logRepository; - } - @GetMapping @PreAuthorize("hasRole('ROOT')") public List getLogs() {