FINERACT-2326: Use Hibernate Validator

Author: adamsaghy

buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle

@@ -123,7 +123,6 @@ dependencyManagement {
         dependency 'jakarta.jms:jakarta.jms-api:3.1.0'
         dependency 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
         dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version
-        dependency 'org.apache.bval:org.apache.bval.bundle:3.0.2'
         dependency 'joda-time:joda-time:2.13.1'
 
         dependency 'io.github.classgraph:classgraph:4.8.179'

fineract-cob/dependencies.gradle

@@ -88,8 +88,6 @@ dependencies {
 
     // runtimeOnly dependencies are things that Fineract code has no direct compile time dependency on, but which must be present at run-time
     runtimeOnly(
-            'org.apache.bval:org.apache.bval.bundle',
-
             // Although fineract (at the time of writing) doesn't have any compile time dep. on httpclient,
             // it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
             'org.apache.httpcomponents:httpclient'

fineract-core/dependencies.gradle

@@ -87,7 +87,6 @@ dependencies {
 
     // runtimeOnly dependencies are things that Fineract code has no direct compile time dependency on, but which must be present at run-time
     runtimeOnly(
-            'org.apache.bval:org.apache.bval.bundle',
 
             // Although fineract (at the time of writing) doesn't have any compile time dep. on httpclient,
             // it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility

fineract-core/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/JakartaValidationExceptionMapper.java

@@ -30,8 +30,6 @@
 import org.apache.fineract.infrastructure.core.data.ApiGlobalErrorResponse;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
-import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
 @Slf4j
@@ -40,8 +38,6 @@
 @RequiredArgsConstructor
 public class JakartaValidationExceptionMapper implements FineractExceptionMapper, ExceptionMapper<ConstraintViolationException> {
 
-    private final MessageSource messageSource;
-
     @Override
     public Response toResponse(final ConstraintViolationException exception) {
         log.warn("Exception occurred", ErrorHandler.findMostSpecificException(exception));
@@ -61,9 +57,7 @@ private List<ApiParameterError> getApiParameterErrors(final ConstraintViolationE
             final String messageTemplate = violation.getMessageTemplate();
             final String messageKey = messageTemplate.replace("{", "").replace("}", "");
 
-            final String interpolatedMessage = messageSource.getMessage(messageKey, null, LocaleContextHolder.getLocale());
-
-            return ApiParameterError.parameterError(messageKey, interpolatedMessage, violation.getPropertyPath().toString());
+            return ApiParameterError.parameterError(messageKey, violation.getMessage(), violation.getPropertyPath().toString());
         }).toList();
     }
 

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/ErrorMessageHelper.java

@@ -64,7 +64,7 @@ public static String setIncorrectBusinessDateFailure() {
     }
 
     public static String setIncorrectBusinessDateMandatoryFailure() {
-        return "The parameter 'date' is mandatory: '${validatedValue}'.";
+        return "The parameter 'date' is mandatory.";
     }
 
     public static String setCurrencyEmptyValueFailure() {

fineract-provider/dependencies.gradle

@@ -186,8 +186,6 @@ dependencies {
 
     // runtimeOnly dependencies are things that Fineract code has no direct compile time dependency on, but which must be present at run-time
     runtimeOnly(
-            'org.apache.bval:org.apache.bval.bundle',
-
             // Although fineract (at the time of writing) doesn't have any compile time dep. on httpclient,
             // it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
             'org.apache.httpcomponents:httpclient'

fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/validation/BusinessDateValidationTest.java

@@ -20,69 +20,84 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.fineract.infrastructure.businessdate.data.BusinessDateUpdateRequest;
 import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
-import org.apache.fineract.validation.config.ValidationConfig;
+import org.hibernate.validator.HibernateValidator;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.validation.Validator;
 
 @Slf4j
 @SpringBootTest
-@ContextConfiguration(classes = { ValidationConfig.class })
+@ContextConfiguration(classes = { BusinessDateValidationTest.TestConfig.class })
 class BusinessDateValidationTest {
 
+    @Configuration
+    @Import({ MessageSourceAutoConfiguration.class })
+    static class TestConfig {
+
+        @Bean
+        public jakarta.validation.Validator validator() {
+            return Validation.byProvider(HibernateValidator.class).configure().buildValidatorFactory().getValidator();
+        }
+    }
+
     @Autowired
     private Validator validator;
 
     @Test
     void invalidAllBlank() {
         var request = BusinessDateUpdateRequest.builder().dateFormat("").type(null).date("  ").locale(null).build();
 
-        var errors = validator.validateObject(request);
+        var errors = validator.validate(request);
 
-        assertThat(errors.getFieldErrorCount()).isEqualTo(5);
+        assertThat(errors).hasSize(6);
 
-        assertThat(errors.getFieldErrors()).anyMatch(e -> e.getField().equals("date"));
-        assertThat(errors.getFieldErrors()).anyMatch(e -> e.getField().equals("dateFormat"));
-        assertThat(errors.getFieldErrors()).anyMatch(e -> e.getField().equals("locale"));
-        assertThat(errors.getFieldErrors()).anyMatch(e -> e.getField().equals("type"));
+        assertThat(errors).anyMatch(e -> e.getPropertyPath().toString().equals("date"));
+        assertThat(errors).anyMatch(e -> e.getPropertyPath().toString().equals("dateFormat"));
+        assertThat(errors).anyMatch(e -> e.getPropertyPath().toString().equals("locale"));
+        assertThat(errors).anyMatch(e -> e.getPropertyPath().toString().equals("type"));
     }
 
     @Test
     void invalidLocale() {
         var request = BusinessDateUpdateRequest.builder().dateFormat("dd-MM-yyyy").type(BusinessDateType.BUSINESS_DATE).date("12-05-2025")
                 .locale("INVALID").build();
 
-        var errors = validator.validateObject(request);
+        var errors = validator.validate(request);
 
-        assertThat(errors.getFieldErrorCount()).isEqualTo(1);
+        assertThat(errors).hasSize(1);
 
-        assertThat(errors.getFieldErrors()).anyMatch(e -> e.getField().equals("locale"));
+        assertThat(errors).anyMatch(e -> e.getPropertyPath().toString().equals("locale"));
     }
 
     @Test
     void invalidDateFormat() {
         var request = BusinessDateUpdateRequest.builder().dateFormat("dd/MM/yyyy").type(BusinessDateType.BUSINESS_DATE).date("12-05-2025")
                 .locale("en").build();
 
-        var errors = validator.validateObject(request);
+        var errors = validator.validate(request);
 
-        assertThat(errors.getErrorCount()).isEqualTo(1);
+        assertThat(errors).hasSize(1);
 
-        assertThat(errors.getAllErrors()).anyMatch(e -> "Wrong local date fields.".equals(e.getDefaultMessage()));
+        assertThat(errors).anyMatch(e -> "Wrong local date fields.".equals(e.getMessage()));
     }
 
     @Test
     void valid() {
         var request = BusinessDateUpdateRequest.builder().dateFormat("dd-MM-yyyy").type(BusinessDateType.BUSINESS_DATE).date("12-05-2025")
                 .locale("en").build();
 
-        var errors = validator.validateObject(request);
+        var errors = validator.validate(request);
 
-        assertThat(errors.getFieldErrorCount()).isEqualTo(0);
+        assertThat(errors).hasSize(0);
     }
 }

fineract-validation/src/main/java/org/apache/fineract/validation/config/ValidationConfig.java

@@ -30,7 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
-class LocalDateValidator implements ConstraintValidator<LocalDate, Object> {
+public class LocalDateValidator implements ConstraintValidator<LocalDate, Object> {
 
     private String dateField;
     private String formatField;

fineract-validation/src/main/java/org/apache/fineract/validation/constraints/LocalDateValidator.java

@@ -23,7 +23,7 @@
 import java.util.Arrays;
 import org.apache.commons.lang3.StringUtils;
 
-class LocaleValidator implements ConstraintValidator<Locale, String> {
+public class LocaleValidator implements ConstraintValidator<Locale, String> {
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {