Merge pull request #111 from avaje/feature/fix-classlevel

Treat null field as empty string for class level validations

Author: rbygrave

blackbox-test/src/test/java/example/avaje/crossfield/ATarnishedTest.java

@@ -23,8 +23,8 @@ void valid() {
   void invalid_classLevelValidation() {
     var violation = one(new ATarnished("ok", 49, 50));
     assertThat(violation.message()).isEqualTo("put these foolish ambitions to rest");
-    assertThat(violation.path()).isEqualTo("null");
-    assertThat(violation.field()).isNull();
+    assertThat(violation.path()).isEqualTo("");
+    assertThat(violation.field()).isEqualTo("");
   }
 
 

validator/src/main/java/io/avaje/validation/core/DRequest.java

@@ -52,12 +52,17 @@ private String currentPath() {
   @Override
   public void addViolation(ValidationContext.Message msg, String propertyName) {
     final String message = validator.interpolate(msg, locale);
-    violations.add(new ConstraintViolation(currentPath() + propertyName, propertyName, message));
+    final String field = field(propertyName);
+    violations.add(new ConstraintViolation(currentPath() + field, field, message));
     if (failfast) {
       throwWithViolations();
     }
   }
 
+  private String field(String propertyName) {
+    return propertyName == null ? "" : propertyName;
+  }
+
   @Override
   public void pushPath(String path) {
     pathStack.push(path);