fix: add different sort delimiter cause of spring bug

spring-projects/spring-framework#23820
ntua-unit-of-control-and-informatics · Jul 24, 2024 · a2551b8 · a2551b8
1 parent 144c955
commit a2551b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/kotlin/org/jaqpot/api/service/util/SortUtil.kt b/src/main/kotlin/org/jaqpot/api/service/util/SortUtil.kt
@@ -5,14 +5,16 @@ import org.springframework.data.domain.Sort.Order
 
 class SortUtil {
     companion object {
+        private const val SORT_DELIMITER = "|" // Delimiter for sorting parameters
+
         fun parseSortParameters(sortParams: List<String>?): List<Order> {
             if (sortParams.isNullOrEmpty()) {
                 return listOf()
             }
 
             return sortParams
                 .map { sortParam: String ->
-                    val parts = sortParam.split(",".toRegex()).dropLastWhile { it.isEmpty() }
+                    val parts = sortParam.split(SORT_DELIMITER).dropLastWhile { it.isEmpty() }
                         .toTypedArray()
                     if (parts.size == 2) {
                         return@map Order(Sort.Direction.fromString(parts[1]), parts[0])

diff --git a/src/main/resources/openapi.yaml b/src/main/resources/openapi.yaml
@@ -71,7 +71,7 @@ paths:
             type: array
             items:
               type: string
-            example: [ "field1,asc", "field2,desc" ]
+            example: [ "field1|asc", "field2|desc" ]
       responses:
         '200':
           description: Paginated list of models
@@ -128,7 +128,7 @@ paths:
             type: array
             items:
               type: string
-            example: [ "field1,asc", "field2,desc" ]
+            example: [ "field1|asc", "field2|desc" ]
       responses:
         '200':
           description: Paginated list of models
@@ -180,7 +180,7 @@ paths:
             type: array
             items:
               type: string
-            example: [ "field1,asc", "field2,desc" ]
+            example: [ "field1|asc", "field2|desc" ]
       responses:
         '200':
           description: Paginated list of shared models
@@ -492,7 +492,7 @@ paths:
             type: array
             items:
               type: string
-            example: [ "field1,asc", "field2,desc" ]
+            example: [ "field1|asc", "field2|desc" ]
       responses:
         '200':
           description: Successful Response
@@ -764,7 +764,7 @@ paths:
             type: array
             items:
               type: string
-            example: [ "field1,asc", "field2,desc" ]
+            example: [ "field1|asc", "field2|desc" ]
       responses:
         "200":
           description: "Models retrieved successfully"