From 0be09b738c8437171c7b67a4096aea0cb2d3bfc9 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 23 Sep 2025 06:57:29 +0300 Subject: [PATCH 1/6] Annotate ItemServiceModel with Lombok Getter and Setter annotations --- .../model/service/ItemServiceModel.java | 51 ++----------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/service/ItemServiceModel.java b/src/main/java/bg/softuni/invoice/model/service/ItemServiceModel.java index 5e441fe..576e216 100644 --- a/src/main/java/bg/softuni/invoice/model/service/ItemServiceModel.java +++ b/src/main/java/bg/softuni/invoice/model/service/ItemServiceModel.java @@ -1,9 +1,13 @@ package bg.softuni.invoice.model.service; import bg.softuni.invoice.model.enumerated.VatValue; +import lombok.Getter; +import lombok.Setter; import java.math.BigDecimal; +@Setter +@Getter public class ItemServiceModel { private String id; @@ -13,51 +17,4 @@ public class ItemServiceModel { private String imageUrl; private int quantity; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public VatValue getVatValue() { - return vatValue; - } - - public void setVatValue(VatValue vatValue) { - this.vatValue = vatValue; - } - - public String getImageUrl() { - return imageUrl; - } - - public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; - } - - public int getQuantity() { - return quantity; - } - - public void setQuantity(int quantity) { - this.quantity = quantity; - } } From f523e8cf2e33cca69ea4a40e2875e6eec7a8fea2 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 23 Sep 2025 06:57:46 +0300 Subject: [PATCH 2/6] Annotate ItemViewModel with Lombok Getter and Setter annotations --- .../invoice/model/view/ItemViewModel.java | 52 ++----------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/view/ItemViewModel.java b/src/main/java/bg/softuni/invoice/model/view/ItemViewModel.java index add50e0..5c925b4 100644 --- a/src/main/java/bg/softuni/invoice/model/view/ItemViewModel.java +++ b/src/main/java/bg/softuni/invoice/model/view/ItemViewModel.java @@ -1,7 +1,12 @@ package bg.softuni.invoice.model.view; +import lombok.Getter; +import lombok.Setter; + import java.math.BigDecimal; +@Setter +@Getter public class ItemViewModel { private String id; @@ -11,51 +16,4 @@ public class ItemViewModel { private String imageUrl; private int quantity; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public String getVatValue() { - return vatValue; - } - - public void setVatValue(String vatValue) { - this.vatValue = vatValue; - } - - public String getImageUrl() { - return imageUrl; - } - - public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; - } - - public int getQuantity() { - return quantity; - } - - public void setQuantity(int quantity) { - this.quantity = quantity; - } } From d47c61e2f7daba5081f709a3975b27b412743b51 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 23 Sep 2025 06:58:08 +0300 Subject: [PATCH 3/6] Annotate ItemAddBindingModel with Lombok Getter and Setter annotations --- .../model/bind/ItemAddBindingModel.java | 35 +++---------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/bind/ItemAddBindingModel.java b/src/main/java/bg/softuni/invoice/model/bind/ItemAddBindingModel.java index 5293ee1..6140eea 100644 --- a/src/main/java/bg/softuni/invoice/model/bind/ItemAddBindingModel.java +++ b/src/main/java/bg/softuni/invoice/model/bind/ItemAddBindingModel.java @@ -3,6 +3,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; +import lombok.Getter; +import lombok.Setter; import org.hibernate.validator.constraints.Length; import org.springframework.web.multipart.MultipartFile; @@ -12,6 +14,8 @@ import static bg.softuni.invoice.constant.ErrorMsg.PRICE_POSITIVE; import static bg.softuni.invoice.constant.ErrorMsg.STRING_MIN_LENGTH; +@Setter +@Getter public class ItemAddBindingModel { @NotBlank(message = NAME_MIN_LENGTH) @@ -27,35 +31,4 @@ public class ItemAddBindingModel { private MultipartFile imageUrl; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public MultipartFile getImageUrl() { - return imageUrl; - } - - public void setImageUrl(MultipartFile imageUrl) { - this.imageUrl = imageUrl; - } - - public String getVatValue() { - return vatValue; - } - - public void setVatValue(String vatValue) { - this.vatValue = vatValue; - } } From 8f5c4cca9a2c9c824be3a54b414a94a2e5d71ac1 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 23 Sep 2025 06:58:19 +0300 Subject: [PATCH 4/6] Annotate ItemEditBindingModel with Lombok Getter and Setter annotations --- .../model/bind/ItemEditBindingModel.java | 51 ++----------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/bind/ItemEditBindingModel.java b/src/main/java/bg/softuni/invoice/model/bind/ItemEditBindingModel.java index b39f45c..bf67846 100644 --- a/src/main/java/bg/softuni/invoice/model/bind/ItemEditBindingModel.java +++ b/src/main/java/bg/softuni/invoice/model/bind/ItemEditBindingModel.java @@ -3,6 +3,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; +import lombok.Getter; +import lombok.Setter; import org.hibernate.validator.constraints.Length; import org.springframework.web.multipart.MultipartFile; @@ -13,6 +15,8 @@ import static bg.softuni.invoice.constant.ErrorMsg.PRICE_POSITIVE; import static bg.softuni.invoice.constant.ErrorMsg.STRING_MIN_LENGTH; +@Setter +@Getter public class ItemEditBindingModel { private String id; @@ -33,51 +37,4 @@ public class ItemEditBindingModel { private MultipartFile newImageUrl; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public String getVatValue() { - return vatValue; - } - - public void setVatValue(String vatValue) { - this.vatValue = vatValue; - } - - public String getImageUrl() { - return imageUrl; - } - - public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; - } - - public MultipartFile getNewImageUrl() { - return newImageUrl; - } - - public void setNewImageUrl(MultipartFile newImageUrl) { - this.newImageUrl = newImageUrl; - } } From 4407dff7676b9a1f9e094931982fdf73de53bbf8 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 23 Sep 2025 06:58:34 +0300 Subject: [PATCH 5/6] Annotate ItemServiceImpl with Lombok RequiredArgsConstructor annotation --- .../bg/softuni/invoice/service/impl/ItemServiceImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/service/impl/ItemServiceImpl.java b/src/main/java/bg/softuni/invoice/service/impl/ItemServiceImpl.java index 496adc4..bbdf088 100644 --- a/src/main/java/bg/softuni/invoice/service/impl/ItemServiceImpl.java +++ b/src/main/java/bg/softuni/invoice/service/impl/ItemServiceImpl.java @@ -5,8 +5,8 @@ import bg.softuni.invoice.model.service.ItemServiceModel; import bg.softuni.invoice.repository.ItemRepository; import bg.softuni.invoice.service.ItemService; +import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -14,17 +14,12 @@ import static bg.softuni.invoice.constant.ErrorMsg.ITEM_NOT_FOUND; @Service +@RequiredArgsConstructor public class ItemServiceImpl implements ItemService { private final ItemRepository itemRepository; private final ModelMapper modelMapper; - @Autowired - public ItemServiceImpl(ItemRepository itemRepository, ModelMapper modelMapper) { - this.itemRepository = itemRepository; - this.modelMapper = modelMapper; - } - @Override public List getAllItems() { return this.itemRepository From 59e841be8d06a9b4923e1b7dc278541e6fbe3020 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 23 Sep 2025 06:58:48 +0300 Subject: [PATCH 6/6] Annotate ItemController with Lombok RequiredArgsConstructor annotation --- .../invoice/web/controller/ItemController.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/web/controller/ItemController.java b/src/main/java/bg/softuni/invoice/web/controller/ItemController.java index e060f0b..8eb9a06 100644 --- a/src/main/java/bg/softuni/invoice/web/controller/ItemController.java +++ b/src/main/java/bg/softuni/invoice/web/controller/ItemController.java @@ -8,13 +8,18 @@ import bg.softuni.invoice.service.ItemService; import bg.softuni.invoice.web.annotation.PageTitle; import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -26,6 +31,7 @@ @Controller @RequestMapping("/item") +@RequiredArgsConstructor public class ItemController { private static final String ITEM_ADD_BINDING_MODEL = "itemAddBindingModel"; @@ -34,13 +40,6 @@ public class ItemController { private final ModelMapper modelMapper; private final CloudinaryService cloudinaryService; - @Autowired - public ItemController(ItemService itemService, ModelMapper modelMapper, CloudinaryService cloudinaryService) { - this.itemService = itemService; - this.modelMapper = modelMapper; - this.cloudinaryService = cloudinaryService; - } - @GetMapping("/add") @PageTitle("Item add") @PreAuthorize("hasRole('ADMIN')")