feat: support auto detect datetime format

Author: ymind

src/main/kotlin/team/yi/rsql/querydsl/RsqlConfig.kt

@@ -1,11 +1,11 @@
 package team.yi.rsql.querydsl
 
 import cz.jirutka.rsql.parser.ast.ComparisonNode
+import javax.persistence.EntityManager
 import team.yi.rsql.querydsl.exception.RsqlException
 import team.yi.rsql.querydsl.exception.TypeNotSupportedException
 import team.yi.rsql.querydsl.handler.*
 import team.yi.rsql.querydsl.operator.RsqlOperator
-import javax.persistence.EntityManager
 
 class RsqlConfig<E> private constructor(builder: Builder<E>) {
     private val fieldTypeHandlers: MutableList<Class<out FieldTypeHandler<*>>>
@@ -33,14 +33,11 @@ class RsqlConfig<E> private constructor(builder: Builder<E>) {
             DefaultSortFieldTypeHandler::class.java,
         )
 
-    val entityManager: EntityManager
-    var operators: List<RsqlOperator>
-    var dateFormat: String
+    val entityManager: EntityManager = builder.entityManager
+    var operators: List<RsqlOperator> = builder.operators.orEmpty()
+    var dateFormat: String? = builder.dateFormat
 
     init {
-        entityManager = builder.entityManager
-        operators = builder.operators.orEmpty()
-        dateFormat = builder.dateFormat.orEmpty()
         fieldTypeHandlers = defaultFieldTypeHandlers.toMutableList()
         sortFieldTypeHandlers = defaultSortFieldTypeHandlers.toMutableList()
 

src/main/kotlin/team/yi/rsql/querydsl/handler/DateTimeFieldTypeHandler.kt

@@ -37,6 +37,12 @@ class DateTimeFieldTypeHandler<E : Comparable<E>>(
     override fun toComparable(value: String?): Comparable<E>? {
         if (value.isNullOrBlank()) return null
 
-        return DateUtil.parse(value, rsqlConfig.dateFormat) as? Comparable<E>?
+        val dateFormat = rsqlConfig.dateFormat
+
+        return if (dateFormat.isNullOrEmpty()) {
+            DateUtil.parse(value)
+        } else {
+            DateUtil.parse(value, dateFormat)
+        } as? Comparable<E>?
     }
 }

src/main/kotlin/team/yi/rsql/querydsl/util/DateUtil.kt

@@ -52,7 +52,7 @@ object DateUtil {
     }
 
     fun parse(dateString: String, dateFormat: String): Date? {
-        val format = if (dateFormat.isBlank()) return null else dateFormat
+        val format = dateFormat.ifBlank { return null }
 
         return try {
             val sdf = SimpleDateFormat(format)

src/test/kotlin/team/yi/rsql/querydsl/test/kotlintest/CarNameFieldTypeHandlerTest.kt

@@ -15,7 +15,7 @@ class CarNameFieldTypeHandlerTest : BaseRsqlTest() {
     private lateinit var entityManager: EntityManager
 
     @Test
-    fun shouldReadRsqlConfigxWithFieldTypeHandler() {
+    fun shouldReadRsqlConfigWithFieldTypeHandler() {
         val config = RsqlConfig.Builder<Car>(entityManager)
             .fieldTypeHandler(CarNameFieldTypeHandler::class.java)
             .build()

src/test/kotlin/team/yi/rsql/querydsl/test/kotlintest/QuerydslRsqlTest.kt

@@ -3,14 +3,14 @@ package team.yi.rsql.querydsl.test.kotlintest
 import com.querydsl.core.Tuple
 import com.querydsl.core.types.Ops
 import com.querydsl.core.types.dsl.Expressions
+import javax.persistence.EntityManager
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import team.yi.rsql.querydsl.QuerydslRsql
 import team.yi.rsql.querydsl.RsqlConfig
 import team.yi.rsql.querydsl.model.Car
 import team.yi.rsql.querydsl.test.BaseRsqlTest
-import javax.persistence.EntityManager
 
 @Suppress("SpellCheckingInspection", "UNCHECKED_CAST")
 class QuerydslRsqlTest : BaseRsqlTest() {
@@ -111,6 +111,22 @@ class QuerydslRsqlTest : BaseRsqlTest() {
         }
     }
 
+    @Test
+    fun shouldHandleDateRange() {
+        val rsql = QuerydslRsql.Builder<Car>(entityManager)
+            .from("Car")
+            .where("mfgdt>='2000-01-01 00:01:02' and mfgdt<='6666-12-31 23:59:59'")
+            .build()
+        val cars = rsql.fetch()
+
+        assertNotNull(cars, "result is null")
+
+        cars?.let {
+            assertFalse(cars.isEmpty(), "Can't handle `notnull` operator for Date type")
+            assertEquals(50, cars.size, "Can't handle `notnull` operator for Date type correctly")
+        }
+    }
+
     @Test
     fun shouldHandleNumberIn() {
         val rsql = QuerydslRsql.Builder<Car>(entityManager)