Merge pull request #3 from soujava/829-dynamic-query-restrictions

829 dynamic query restrictions
jakartaee · Nov 27, 2024 · 1e70a1a · 1e70a1a
2 parents 8d01623 + 014fd07
commit 1e70a1a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/api/src/main/java/jakarta/data/BasicRestrictionRecord.java b/api/src/main/java/jakarta/data/BasicRestrictionRecord.java
@@ -21,13 +21,19 @@
 // The proper way for users to obtain instances is via
 // the static metamodel or Restrict.* methods 
 
+import java.util.Objects;
+
 record BasicRestrictionRecord<T>(
         String field,
         boolean isNegated,
         Operator comparison,
         Object value) implements BasicRestriction<T> {
 
+    BasicRestrictionRecord {
+        Objects.requireNonNull(field, "Field must not be null");
+    }
+
     BasicRestrictionRecord(String field, Operator comparison, Object value) {
         this(field, false, comparison, value);
     }
-}
+}
diff --git a/api/src/main/java/jakarta/data/TextRestrictionRecord.java b/api/src/main/java/jakarta/data/TextRestrictionRecord.java
@@ -21,6 +21,8 @@
 // The proper way for users to obtain instances is via
 // the static metamodel or Restrict.* methods 
 
+import java.util.Objects;
+
 record TextRestrictionRecord<T>(
         String field,
         boolean isNegated,
@@ -29,6 +31,10 @@ record TextRestrictionRecord<T>(
         boolean isEscaped,
         String value) implements TextRestriction<T> {
 
+    TextRestrictionRecord {
+        Objects.requireNonNull(field, "Field must not be null");
+    }
+
     TextRestrictionRecord(String field, boolean negated, Operator comparison, boolean escaped, String value) {
         this(field, negated, comparison, true, escaped, value);
     }
@@ -49,4 +55,4 @@ record TextRestrictionRecord<T>(
     public Restriction<T> ignoreCase() {
         return new TextRestrictionRecord<>(field, isNegated, comparison, false, isEscaped, value);
     }
-}
+}
diff --git a/api/src/test/java/jakarta/data/BasicRestrictionRecordTest.java b/api/src/test/java/jakarta/data/BasicRestrictionRecordTest.java
@@ -20,6 +20,8 @@
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
 
 class BasicRestrictionRecordTest {
 
@@ -72,4 +74,11 @@ void shouldSupportNegatedRestrictionUsingDefaultConstructor() {
             soft.assertThat(negatedRestriction.value()).isEqualTo("Unknown");
         });
     }
+
+    @Test
+    void shouldThrowExceptionWhenFieldIsNull() {
+        assertThatThrownBy(() -> new BasicRestrictionRecord<>(null, Operator.EQUAL, "testValue"))
+                .isInstanceOf(NullPointerException.class)
+                .hasMessage("Field must not be null");
+    }
 }
diff --git a/api/src/test/java/jakarta/data/TextRestrictionRecordTest.java b/api/src/test/java/jakarta/data/TextRestrictionRecordTest.java
@@ -20,6 +20,8 @@
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
 
 class TextRestrictionRecordTest {
 
@@ -119,4 +121,11 @@ void shouldSupportNegationForTextRestriction() {
             soft.assertThat(restriction.isEscaped()).isFalse();
         });
     }
+
+    @Test
+    void shouldThrowExceptionWhenFieldIsNullInTextRestriction() {
+        assertThatThrownBy(() -> new TextRestrictionRecord<>(null, Operator.LIKE, "testValue"))
+                .isInstanceOf(NullPointerException.class)
+                .hasMessage("Field must not be null");
+    }
 }