feat : use SQLStatementValidator and ValidationGroups

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/JpaConfig.java → jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/db/JpaConfig.java

@@ -1,4 +1,4 @@
-package com.example.custom.sequence.config;
+package com.example.custom.sequence.config.db;
 
 import io.hypersistence.utils.spring.repository.BaseJpaRepositoryImpl;
 import org.springframework.context.annotation.Configuration;

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/LazyConnectionDataSourceProxyConfig.java → jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/db/LazyConnectionDataSourceProxyConfig.java

@@ -1,4 +1,4 @@
-package com.example.custom.sequence.config;
+package com.example.custom.sequence.config.db;
 
 import io.hypersistence.utils.logging.InlineQueryLogEntryCreator;
 import javax.sql.DataSource;

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/StringPrefixedNumberFormattedSequenceIdGenerator.java → jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/db/StringPrefixedNumberFormattedSequenceIdGenerator.java

@@ -1,4 +1,4 @@
-package com.example.custom.sequence.config;
+package com.example.custom.sequence.config.db;
 
 import java.io.Serializable;
 import java.lang.reflect.Member;

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/StringPrefixedSequence.java → jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/config/db/StringPrefixedSequence.java

@@ -1,4 +1,4 @@
-package com.example.custom.sequence.config;
+package com.example.custom.sequence.config.db;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/entities/Customer.java

@@ -1,6 +1,6 @@
 package com.example.custom.sequence.entities;
 
-import com.example.custom.sequence.config.StringPrefixedSequence;
+import com.example.custom.sequence.config.db.StringPrefixedSequence;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/entities/Order.java

@@ -1,6 +1,6 @@
 package com.example.custom.sequence.entities;
 
-import com.example.custom.sequence.config.StringPrefixedSequence;
+import com.example.custom.sequence.config.db.StringPrefixedSequence;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/mapper/CustomerMapper.java

@@ -30,6 +30,9 @@ public CustomerResponse mapToResponse(Customer saved) {
 
     public Customer mapToEntity(CustomerRequest customerRequest) {
         Customer customer = new Customer(customerRequest.text());
+        if (customerRequest.orders() == null) {
+            return customer;
+        }
         customerRequest
                 .orders()
                 .forEach(orderRequest -> customer.addOrder(orderMapper.mapToEntity(orderRequest)));
@@ -38,6 +41,9 @@ public Customer mapToEntity(CustomerRequest customerRequest) {
 
     public void updateCustomerFromRequest(CustomerRequest customerRequest, Customer foundCustomer) {
         foundCustomer.setText(customerRequest.text());
+        if (customerRequest.orders() == null) {
+            return;
+        }
         List<Order> removedOrders = new ArrayList<>(foundCustomer.getOrders());
         List<Order> ordersFromRequest =
                 customerRequest.orders().stream()

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/model/request/CustomerRequest.java

@@ -1,7 +1,9 @@
 package com.example.custom.sequence.model.request;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import java.util.List;
 
 public record CustomerRequest(
-        @NotBlank(message = "Text cannot be empty") String text, List<OrderRequest> orders) {}
+        @NotBlank(message = "Text cannot be empty") String text,
+        @Valid List<OrderRequest> orders) {}

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/model/request/OrderRequest.java

@@ -1,8 +1,10 @@
 package com.example.custom.sequence.model.request;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
 
 public record OrderRequest(
-        @NotEmpty(message = "Text cannot be empty") String text,
-        @NotBlank(message = "CustomerId cannot be blank") String customerId) {}
+        @NotBlank(message = "Text cannot be empty") String text,
+        @NotBlank(
+                        message = "CustomerId cannot be blank",
+                        groups = ValidationGroups.GroupCheck.class)
+                String customerId) {}

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/model/request/ValidationGroups.java

@@ -0,0 +1,8 @@
+package com.example.custom.sequence.model.request;
+
+public interface ValidationGroups {
+
+    interface SkipGroupCheck {}
+
+    interface GroupCheck {}
+}

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/services/CustomerService.java

@@ -77,8 +77,11 @@ public Optional<CustomerResponse> updateCustomerById(
     }
 
     @Transactional
-    public void deleteCustomerById(String id) {
-        customerRepository.deleteById(id);
+    public Optional<CustomerResponse> deleteCustomerById(String id) {
+        Optional<CustomerResponse> optionalCustomer = findCustomerById(id);
+        optionalCustomer.ifPresent(
+                customerResponse -> customerRepository.deleteById(customerResponse.id()));
+        return optionalCustomer;
     }
 
     public Optional<Customer> findById(String customerId) {

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/web/controllers/CustomerController.java

@@ -2,11 +2,13 @@
 
 import com.example.custom.sequence.entities.Customer;
 import com.example.custom.sequence.model.request.CustomerRequest;
+import com.example.custom.sequence.model.request.ValidationGroups;
 import com.example.custom.sequence.model.response.CustomerResponse;
 import com.example.custom.sequence.model.response.PagedResult;
 import com.example.custom.sequence.services.CustomerService;
 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;
@@ -60,13 +62,16 @@ public ResponseEntity<CustomerResponse> getCustomerById(@PathVariable String id)
     @ResponseStatus(HttpStatus.CREATED)
     @Override
     public CustomerResponse createCustomer(
-            @RequestBody @Validated CustomerRequest customerRequest) {
+            @RequestBody @Validated(value = {Default.class, ValidationGroups.SkipGroupCheck.class})
+                    CustomerRequest customerRequest) {
         return customerService.saveCustomer(customerRequest);
     }
 
     @PutMapping("/{id}")
     public ResponseEntity<CustomerResponse> updateCustomer(
-            @PathVariable String id, @RequestBody CustomerRequest customerRequest) {
+            @PathVariable String id,
+            @RequestBody @Validated(value = {Default.class, ValidationGroups.GroupCheck.class})
+                    CustomerRequest customerRequest) {
         return customerService
                 .updateCustomerById(id, customerRequest)
                 .map(ResponseEntity::ok)
@@ -76,12 +81,8 @@ public ResponseEntity<CustomerResponse> updateCustomer(
     @DeleteMapping("/{id}")
     public ResponseEntity<CustomerResponse> deleteCustomer(@PathVariable String id) {
         return customerService
-                .findCustomerById(id)
-                .map(
-                        customer -> {
-                            customerService.deleteCustomerById(id);
-                            return ResponseEntity.ok(customer);
-                        })
+                .deleteCustomerById(id)
+                .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.notFound().build());
     }
 }

jpa/boot-data-customsequence/src/main/java/com/example/custom/sequence/web/controllers/OrderController.java

@@ -1,10 +1,12 @@
 package com.example.custom.sequence.web.controllers;
 
 import com.example.custom.sequence.model.request.OrderRequest;
+import com.example.custom.sequence.model.request.ValidationGroups;
 import com.example.custom.sequence.model.response.OrderResponse;
 import com.example.custom.sequence.model.response.PagedResult;
 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;
@@ -53,7 +55,8 @@ public ResponseEntity<OrderResponse> getOrderById(@PathVariable String id) {
 
     @PostMapping
     public ResponseEntity<OrderResponse> createOrder(
-            @RequestBody @Validated OrderRequest orderRequest) {
+            @RequestBody @Validated(value = {Default.class, ValidationGroups.GroupCheck.class})
+                    OrderRequest orderRequest) {
         return orderService
                 .saveOrder(orderRequest)
                 .map(order -> ResponseEntity.status(HttpStatus.CREATED).body(order))
@@ -62,7 +65,9 @@ public ResponseEntity<OrderResponse> createOrder(
 
     @PutMapping("/{id}")
     public ResponseEntity<OrderResponse> updateOrder(
-            @PathVariable String id, @RequestBody OrderRequest orderRequest) {
+            @PathVariable String id,
+            @RequestBody @Validated(value = {Default.class, ValidationGroups.GroupCheck.class})
+                    OrderRequest orderRequest) {
         return orderService
                 .updateOrderById(id, orderRequest)
                 .map(ResponseEntity::ok)

jpa/boot-data-customsequence/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-com.example.custom.sequence.config.LazyConnectionDataSourceProxyConfig
+com.example.custom.sequence.config.db.LazyConnectionDataSourceProxyConfig

jpa/boot-data-customsequence/src/test/java/com/example/custom/sequence/SchemaValidationTest.java

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.example.custom.sequence.common.ContainersConfig;
-import com.example.custom.sequence.config.JpaConfig;
+import com.example.custom.sequence.config.db.JpaConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import javax.sql.DataSource;
 import org.junit.jupiter.api.Test;

jpa/boot-data-customsequence/src/test/java/com/example/custom/sequence/common/AbstractIntegrationTest.java

@@ -9,7 +9,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.assertj.MockMvcTester;
 
 /**
  * Base class for integration tests providing test infrastructure including: - Configured DataSource
@@ -23,7 +23,7 @@
 @AutoConfigureMockMvc
 public abstract class AbstractIntegrationTest {
 
-    @Autowired protected MockMvc mockMvc;
+    @Autowired protected MockMvcTester mockMvcTester;
 
     @Autowired protected ObjectMapper objectMapper;
 

jpa/boot-data-customsequence/src/test/java/com/example/custom/sequence/services/CustomerServiceTest.java

@@ -9,8 +9,8 @@
 import com.example.custom.sequence.entities.Customer;
 import com.example.custom.sequence.mapper.CustomerMapper;
 import com.example.custom.sequence.model.request.CustomerRequest;
-import com.example.custom.sequence.model.response.CustomerResponse;
-import com.example.custom.sequence.model.response.PagedResult;
+import com.example.custom.sequence.model.request.OrderRequest;
+import com.example.custom.sequence.model.response.*;
 import com.example.custom.sequence.repositories.CustomerRepository;
 import java.util.List;
 import java.util.Optional;
@@ -88,6 +88,8 @@ void saveCustomer() {
     void deleteCustomerById() {
         // given
         willDoNothing().given(customerRepository).deleteById("CUS_1");
+        given(customerRepository.findById("CUS_1")).willReturn(Optional.of(getCustomer()));
+        given(customerMapper.mapToResponse(getCustomer())).willReturn(getCustomerResponse());
         // when
         customerService.deleteCustomerById("CUS_1");
         // then
@@ -102,10 +104,13 @@ private Customer getCustomer() {
     }
 
     private CustomerRequest getCustomerRequest() {
-        return new CustomerRequest("junitTest", List.of());
+        return new CustomerRequest("junitTest", List.of(new OrderRequest("ORD_1", "junitTest")));
     }
 
     private CustomerResponse getCustomerResponse() {
-        return new CustomerResponse("CUS_1", "junitTest", List.of());
+        return new CustomerResponse(
+                "CUS_1",
+                "junitTest",
+                List.of(new OrderResponseWithOutCustomer("ORD_1", "junitTest")));
     }
 }