Support for Java 8 Date/Time API in parameters #125

add support java.sql.Time
cuba-platform · Mar 3, 2021 · 9f41585 · 9f41585
1 parent 52a0dd5
commit 9f41585
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/modules/rest-api/src/com/haulmont/addon/restapi/api/common/RestParseUtils.java b/modules/rest-api/src/com/haulmont/addon/restapi/api/common/RestParseUtils.java
@@ -105,7 +105,11 @@ public Object toObject(Type type, String value, @Nullable String modelVersion) t
             return Datatypes.getNN(OffsetTime.class).parse(value);
         }
         if (Time.class == clazz) {
-            return Datatypes.getNN(Time.class).parse(value);
+            LocalTime result = Datatypes.getNN(LocalTime.class).parse(value);
+            if (result == null) {
+                return null;
+            }
+            return Time.valueOf(result);
         }
         if (BigDecimal.class == clazz) return Datatypes.getNN(BigDecimal.class).parse(value);
         if (Boolean.class == clazz || Boolean.TYPE == clazz) return Datatypes.getNN(Boolean.class).parse(value);

diff --git a/.../restapi-demo/modules/core/src/com/haulmont/rest/demo/core/app/PortalTestServiceBean.java b/.../restapi-demo/modules/core/src/com/haulmont/rest/demo/core/app/PortalTestServiceBean.java
@@ -61,7 +61,7 @@ public String convertDate(LocalDate localDate, LocalDateTime localDateTime, Loca
         builder.append(localDateTime.toString()).append(",");
         builder.append(localTime.toString()).append(",");
         builder.append(offsetDateTime.toString()).append(",");
-        builder.append(offsetTime.toString());
+        builder.append(offsetTime.toString()).append(",");
         builder.append(time.toString());
         return builder.toString();
     }

diff --git a/...stapi-demo/modules/portal/test/com/haulmont/rest/demo/http/rest/ServicesControllerFT.java b/...stapi-demo/modules/portal/test/com/haulmont/rest/demo/http/rest/ServicesControllerFT.java
@@ -79,7 +79,7 @@ public void serviceWithDateParams() throws Exception {
         String requestBody = getFileContent("serviceWithDateParams.json", null);
         try (CloseableHttpResponse response = sendPost("/services/" + PortalTestService.NAME + "/convertDate", oauthToken, requestBody, null)) {
             assertEquals(HttpStatus.SC_OK, statusCode(response));
-            assertEquals("2021-02-24,2021-02-24T15:15:15.053,15:15:15,2021-02-24T15:15:15.053+04:00,15:15:15+04:00", responseToString(response));
+            assertEquals("2021-02-24,2021-02-24T15:15:15.053,15:15:15,2021-02-24T15:15:15.053+04:00,15:15:15+04:00,15:15:15", responseToString(response));
         }
     }