delombok

rajadilipkolli · Dec 22, 2024 · d86bc51 · d86bc51
1 parent d34246a
commit d86bc51
Show file tree

Hide file tree

Showing 10 changed files with 138 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ The following table list all sample codes related to the spring boot integration
 | [Rabbit Mq Implementation](./boot-rabbitmq-thymeleaf)                                                                   | The application, demonstrates how rabbitmq works with producer side acknowledgement                                                                                                                            | Completed |
 | [Spring Batch Implementation](./batch-boot-jpa-sample)                                                                  | The application, demonstrates implementing Spring Batch 5 using simple config and creating batch tables using liquibase                                                                                        | Completed |
 | [Rest API Documentation with examples](./boot-rest-docs-sample)                                                         | This application, demonstrates ability to generate pdf API documentation using spring rest docs                                                                                                                | Completed |  
-| [Custom SequenceNumber and LazyConnectionDataSourceProxy for db connection improvement](./jpa/boot-data-customsequence) | This application, demonstrated ability to create custom sequences, using datasource-proxy and LazyConnectionDataSourceProxy for db connection improvement using mariadb                                        | Completed |
+| [Custom SequenceNumber and LazyConnectionDataSourceProxy for db connection improvement](./jpa/boot-data-customsequence) | This application, demonstrated ability to create custom sequences, using datasource-proxy, LazyConnectionDataSourceProxy for db connection improvement using mariadb, SQLStatementCountValidator for validating SQLCounts and ValidationGroups for dynamic Validation                                        | Completed |
 | [KeySet pagination and dynamic search](./jpa/keyset-pagination/blaze-persistence)                                       | Implements KeySet Pagination using Blaze Persistence and enable dynamic search using specifications                                                                                                            | Completed |
 
 For More info about this repository, Please visit [here](https://rajadilipkolli.github.io/my-spring-boot-experiments/)

diff --git a/jpa/boot-data-customsequence/pom.xml b/jpa/boot-data-customsequence/pom.xml
@@ -60,11 +60,6 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
 
         <!-- database related dependencies -->
         <dependency>

diff --git a/...ustomsequence/src/main/java/com/example/custom/sequence/config/ApplicationProperties.java b/...ustomsequence/src/main/java/com/example/custom/sequence/config/ApplicationProperties.java
@@ -1,19 +1,66 @@
 package com.example.custom.sequence.config;
 
-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
-@Data
 @ConfigurationProperties("application")
 public class ApplicationProperties {
-    private Cors cors = new Cors();
 
-    @Data
+    @NestedConfigurationProperty private Cors cors = new Cors();
+
+    public Cors getCors() {
+        return cors;
+    }
+
+    public void setCors(Cors cors) {
+        this.cors = cors;
+    }
+
     public static class Cors {
         private String pathPattern = "/api/**";
         private String allowedMethods = "*";
         private String allowedHeaders = "*";
         private String allowedOriginPatterns = "*";
         private boolean allowCredentials = true;
+
+        public String getPathPattern() {
+            return pathPattern;
+        }
+
+        public void setPathPattern(String pathPattern) {
+            this.pathPattern = pathPattern;
+        }
+
+        public String getAllowedMethods() {
+            return allowedMethods;
+        }
+
+        public void setAllowedMethods(String allowedMethods) {
+            this.allowedMethods = allowedMethods;
+        }
+
+        public String getAllowedHeaders() {
+            return allowedHeaders;
+        }
+
+        public void setAllowedHeaders(String allowedHeaders) {
+            this.allowedHeaders = allowedHeaders;
+        }
+
+        public String getAllowedOriginPatterns() {
+            return allowedOriginPatterns;
+        }
+
+        public void setAllowedOriginPatterns(String allowedOriginPatterns) {
+            this.allowedOriginPatterns = allowedOriginPatterns;
+        }
+
+        public boolean isAllowCredentials() {
+            return allowCredentials;
+        }
+
+        public void setAllowCredentials(boolean allowCredentials) {
+            this.allowCredentials = allowCredentials;
+        }
     }
 }
diff --git a/...oot-data-customsequence/src/main/java/com/example/custom/sequence/config/Initializer.java b/...oot-data-customsequence/src/main/java/com/example/custom/sequence/config/Initializer.java
@@ -1,17 +1,20 @@
 package com.example.custom.sequence.config;
 
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 @Component
-@RequiredArgsConstructor
-@Slf4j
 public class Initializer implements CommandLineRunner {
 
+    private static final Logger log = LoggerFactory.getLogger(Initializer.class);
     private final ApplicationProperties properties;
 
+    public Initializer(ApplicationProperties properties) {
+        this.properties = properties;
+    }
+
     @Override
     public void run(String... args) {
         log.info("Running Initializer.....");

diff --git a/...ot-data-customsequence/src/main/java/com/example/custom/sequence/config/WebMvcConfig.java b/...ot-data-customsequence/src/main/java/com/example/custom/sequence/config/WebMvcConfig.java
@@ -1,16 +1,18 @@
 package com.example.custom.sequence.config;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration(proxyBeanMethods = false)
-@RequiredArgsConstructor
 public class WebMvcConfig implements WebMvcConfigurer {
 
     private final ApplicationProperties properties;
 
+    public WebMvcConfig(ApplicationProperties properties) {
+        this.properties = properties;
+    }
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping(properties.getCors().getPathPattern())

diff --git a/...boot-data-customsequence/src/main/java/com/example/custom/sequence/entities/Customer.java b/...boot-data-customsequence/src/main/java/com/example/custom/sequence/entities/Customer.java
@@ -12,18 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.hibernate.Hibernate;
 
 @Entity
 @Table(name = "customers")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
 public class Customer {
 
     @Id
@@ -37,18 +29,55 @@ public class Customer {
     @OneToMany(mappedBy = "customer", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Order> orders = new ArrayList<>();
 
+    public Customer() {}
+
+    public Customer(String id, String text, List<Order> orders) {
+        this.id = id;
+        this.text = text;
+        this.orders = orders;
+    }
+
     public Customer(String text) {
         this.text = text;
     }
 
-    public void addOrder(Order order) {
+    public String getId() {
+        return id;
+    }
+
+    public Customer setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public Customer setText(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public List<Order> getOrders() {
+        return orders;
+    }
+
+    public Customer setOrders(List<Order> orders) {
+        this.orders = orders;
+        return this;
+    }
+
+    public Customer addOrder(Order order) {
         orders.add(order);
         order.setCustomer(this);
+        return this;
     }
 
-    public void removeOrder(Order removedOrder) {
+    public Customer removeOrder(Order removedOrder) {
         orders.remove(removedOrder);
         removedOrder.setCustomer(null);
+        return this;
     }
 
     @Override

diff --git a/jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/entities/Order.java b/jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/entities/Order.java
@@ -11,18 +11,10 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.hibernate.Hibernate;
 
 @Entity
 @Table(name = "orders")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
 public class Order {
 
     @Id
@@ -37,6 +29,41 @@ public class Order {
     @JoinColumn(name = "customer_id")
     private Customer customer;
 
+    public Order() {}
+
+    public Order(String id, String text, Customer customer) {
+        this.id = id;
+        this.text = text;
+        this.customer = customer;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Order setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public Order setText(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public Customer getCustomer() {
+        return customer;
+    }
+
+    public Order setCustomer(Customer customer) {
+        this.customer = customer;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/...equence/src/main/java/com/example/custom/sequence/web/controllers/CustomerController.java b/...equence/src/main/java/com/example/custom/sequence/web/controllers/CustomerController.java
@@ -9,7 +9,6 @@
 import com.example.custom.sequence.utils.AppConstants;
 import com.example.custom.sequence.web.api.CustomerAPI;
 import jakarta.validation.groups.Default;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +25,6 @@
 
 @RestController
 @RequestMapping("/api/customers")
-@Slf4j
 public class CustomerController implements CustomerAPI {
 
     private final CustomerService customerService;

diff --git a/...omsequence/src/main/java/com/example/custom/sequence/web/controllers/OrderController.java b/...omsequence/src/main/java/com/example/custom/sequence/web/controllers/OrderController.java
@@ -7,7 +7,6 @@
 import com.example.custom.sequence.services.OrderService;
 import com.example.custom.sequence.utils.AppConstants;
 import jakarta.validation.groups.Default;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -23,7 +22,6 @@
 
 @RestController
 @RequestMapping("/api/orders")
-@Slf4j
 public class OrderController {
 
     private final OrderService orderService;

diff --git a/...quence/src/test/java/com/example/custom/sequence/web/controllers/OrderControllerTest.java b/...quence/src/test/java/com/example/custom/sequence/web/controllers/OrderControllerTest.java
@@ -52,7 +52,7 @@ class OrderControllerTest {
 
     @BeforeEach
     void setUp() {
-        customer = new Customer("CUST_01", "customer1", new ArrayList<>());
+        customer = new Customer("CUST_01", "customer1", List.of());
         this.orderList = new ArrayList<>();
         this.orderList.add(new Order("1", "text 1", customer));
         this.orderList.add(new Order("2", "text 2", customer));