Merge pull request #148 from entando/ENG-2405-allowing-local-date-tim…

…e-object-as-filter

ENG-2405 and ENG-2450 Allowing LocalDateTime object as filter

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>entando-core-parent</artifactId>
-        <version>6.3.13</version>
+        <version>6.3.14</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-engine</artifactId>

src/main/java/com/agiletec/aps/system/common/AbstractSearcherDAO.java

@@ -19,6 +19,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -215,6 +216,8 @@ protected void addObjectSearchStatementBlock(PreparedStatement stat,
             stat.setBigDecimal(index, (BigDecimal) object);
         } else if (object instanceof Boolean) {
             stat.setString(index, ((Boolean) object).toString());
+        } else if (object instanceof LocalDateTime) {
+            stat.setObject(index, Timestamp.valueOf((LocalDateTime)object));
         } else {
             stat.setObject(index, object);
         }

src/test/java/org/entando/entando/web/analysis/AnalysisControllerTest.java

@@ -127,7 +127,7 @@ void testRunAnalysis() throws Exception {
 
         result.andExpect(status().isOk());
         result.andDo(MockMvcResultHandlers.print());
-        result.andExpect(content().contentType("application/json;charset=UTF-8"));
+        result.andExpect(content().contentType("application/json"));
         checkByComponentType(result, "widgets");
         checkByComponentType(result, "fragments");
         checkByComponentType(result, "pages");