BroadleafCommerce/QA#1710 - Add API to specify the nullLast property on the CriteriaTransfer object in order to control how the OrderBy clause in the resulting SQL is constructed.

Author: jefffischer

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/dto/FilterAndSortCriteria.java

@@ -51,6 +51,7 @@ public class FilterAndSortCriteria {
     protected Integer order;
 
     protected SortDirection sortDirection;
+    protected boolean nullsLast = true;
 
     public FilterAndSortCriteria(String propertyId, int order) {
         this.propertyId = propertyId;
@@ -202,4 +203,11 @@ public void setOrder(Integer order) {
         this.order = order;
     }
 
+    public boolean isNullsLast() {
+        return nullsLast;
+    }
+
+    public void setNullsLast(boolean nullsLast) {
+        this.nullsLast = nullsLast;
+    }
 }

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/criteria/FilterMapping.java

@@ -85,6 +85,11 @@ public FilterMapping withInheritedFromClass(Class<?> inheritedFromClass) {
         return this;
     }
 
+    public FilterMapping withNullsLast(boolean nullsLast) {
+        setNullsLast(nullsLast);
+        return this;
+    }
+
     public String getFullPropertyName() {
         return fullPropertyName;
     }

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/provider/BasicFieldPersistenceProvider.java

@@ -545,7 +545,8 @@ public FieldProviderResponse addSearchMapping(AddSearchMappingRequest addSearchM
                 .withFullPropertyName(addSearchMappingRequest.getPropertyName())
                 .withFilterValues(fasc.getFilterValues())
                 .withSortDirection(fasc.getSortDirection())
-                .withOrder(fasc.getOrder());
+                .withOrder(fasc.getOrder())
+                .withNullsLast(fasc.isNullsLast());
         filterMappings.add(filterMapping);
 
         if (fasc.hasSpecialFilterValue()) {