Skip to content

Commit fa27094

Browse files
committed
Update Date handling.
1 parent 2c957c6 commit fa27094

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
subprojects {
1616
group = 'org.httprpc'
17-
version = '6.0.2'
17+
version = '6.1'
1818

1919
repositories {
2020
mavenCentral()

kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ private static List<Object> getParameterValues(Object argument) {
911911

912912
private static Object getParameterValue(Object argument) {
913913
if (argument instanceof Date date) {
914-
return date.getTime();
914+
return date.toInstant();
915915
} else {
916916
return argument;
917917
}

kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ private static Object toRawType(Object value, Class<?> type) {
822822
if (value instanceof Number number) {
823823
return new Date(number.longValue());
824824
} else {
825-
return new Date(Long.parseLong(value.toString()));
825+
return Date.from(Instant.parse(value.toString()));
826826
}
827827
} else if (type == Instant.class) {
828828
if (value instanceof Number number) {

kilo-client/src/test/java/org/httprpc/kilo/beans/BeanAdapterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.time.LocalDateTime;
3030
import java.time.LocalTime;
3131
import java.time.Period;
32+
import java.time.format.DateTimeParseException;
3233
import java.util.Date;
3334
import java.util.HashMap;
3435
import java.util.List;
@@ -144,7 +145,7 @@ public void testInvalidPut() {
144145
var beanAdapter = new BeanAdapter(new TestBean());
145146

146147
assertThrows(IllegalArgumentException.class, () -> beanAdapter.put("dayOfWeek", "abc"));
147-
assertThrows(IllegalArgumentException.class, () -> beanAdapter.put("date", "xyz"));
148+
assertThrows(DateTimeParseException.class, () -> beanAdapter.put("date", "xyz"));
148149

149150
assertThrows(UnsupportedOperationException.class, () -> beanAdapter.put("foo", 101));
150151

0 commit comments

Comments
 (0)