constrain field names

2 files changed, 4 insertions, 4 deletions

diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
index 291a3b85e..45b478322 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
-
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Positive;
 
@@ -32,6 +32,7 @@ public class DocumentUpdateRequest {
     private String partition;
 
     @NotEmpty
+    @Valid
     private Collection<Field> fields;
 
     public DocumentUpdateRequest() {
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java
index 831cae1cf..52d5b815f 100644
--- a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java
+++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java
@@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
-
-import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @JsonTypeInfo(
@@ -35,6 +34,7 @@ import jakarta.validation.constraints.NotEmpty;
 })
 public abstract class Field {
 
+    @Pattern(regexp = "^\\$?[a-zA-Z][a-zA-Z0-9_]*$")
     protected final String name;
 
     protected Field(final String name) {
@@ -42,7 +42,6 @@ public abstract class Field {
     }
 
     @JsonProperty
-    @NotEmpty
     public String getName() {
         return name;
     }