Set default values for sort fields in PagingRequest (#809)

kiwiproject · Nov 28, 2022 · 49efb53 · 49efb53
1 parent 2ed7d6b
commit 49efb53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/kiwiproject/spring/data/PagingRequest.java b/src/main/java/org/kiwiproject/spring/data/PagingRequest.java
@@ -67,7 +67,7 @@ public class PagingRequest implements PagingParams {
      */
     @QueryParam("primaryDirection")
     @DefaultValue("ASC")
-    private Sort.Direction primaryDirection;
+    private Sort.Direction primaryDirection = Sort.Direction.ASC;
 
     /**
      * The secondary sort property. Default is null.
@@ -82,5 +82,5 @@ public class PagingRequest implements PagingParams {
      */
     @QueryParam("secondaryDirection")
     @DefaultValue("ASC")
-    private Sort.Direction secondaryDirection;
+    private Sort.Direction secondaryDirection = Sort.Direction.ASC;
 }
diff --git a/src/test/java/org/kiwiproject/spring/data/PagingRequestTest.java b/src/test/java/org/kiwiproject/spring/data/PagingRequestTest.java
@@ -45,9 +45,9 @@ void shouldCreateInstanceWithExpectedDefaults(SoftAssertions softly) {
         softly.assertThat(pagingRequest.getPage()).isZero();
         softly.assertThat(pagingRequest.getLimit()).isEqualTo(100);
         softly.assertThat(pagingRequest.getPrimarySort()).isNull();
-        softly.assertThat(pagingRequest.getPrimaryDirection()).isNull();
+        softly.assertThat(pagingRequest.getPrimaryDirection()).isEqualTo(Sort.Direction.ASC);
         softly.assertThat(pagingRequest.getSecondarySort()).isNull();
-        softly.assertThat(pagingRequest.getSecondaryDirection()).isNull();
+        softly.assertThat(pagingRequest.getSecondaryDirection()).isEqualTo(Sort.Direction.ASC);
     }
 
     @Test