You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by zr...@apache.org on 2025/08/01 12:33:29 UTC
(dubbo-hessian-lite) branch master updated: Optimize serialization performance of Java 8 date/time types. (#84)
This is an automated email from the ASF dual-hosted git repository.
zrlw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-hessian-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 16274b63 Optimize serialization performance of Java 8 date/time types. (#84)
16274b63 is described below
commit 16274b63f2ddf4cb0ca5ef7612de3276077bfe8f
Author: wuwen <wu...@aliyun.com>
AuthorDate: Fri Aug 1 20:33:24 2025 +0800
Optimize serialization performance of Java 8 date/time types. (#84)
---
.../caucho/hessian/io/java8/DurationHandle.java | 14 +--
.../com/caucho/hessian/io/java8/InstantHandle.java | 14 +--
...eSerializer.java => LocalDateDeserializer.java} | 27 +++---
.../caucho/hessian/io/java8/LocalDateHandle.java | 23 ++---
.../hessian/io/java8/LocalDateSerializer.java | 27 +++++-
.../io/java8/LocalDateTimeDeserializer.java | 60 ++++++++++++
.../hessian/io/java8/LocalDateTimeHandle.java | 21 ++--
.../hessian/io/java8/LocalDateTimeSerializer.java | 34 ++++++-
...eSerializer.java => LocalTimeDeserializer.java} | 26 ++---
.../caucho/hessian/io/java8/LocalTimeHandle.java | 20 ++--
.../hessian/io/java8/LocalTimeSerializer.java | 29 +++++-
.../caucho/hessian/io/java8/MonthDayHandle.java | 14 +--
.../hessian/io/java8/OffsetDateTimeHandle.java | 21 ++--
.../caucho/hessian/io/java8/OffsetTimeHandle.java | 21 ++--
.../com/caucho/hessian/io/java8/PeriodHandle.java | 17 ++--
...imeSerializer.java => SerializationConfig.java} | 38 +++++---
.../com/caucho/hessian/io/java8/YearHandle.java | 11 +--
.../caucho/hessian/io/java8/YearMonthHandle.java | 14 +--
.../com/caucho/hessian/io/java8/ZoneIdHandle.java | 11 +--
.../caucho/hessian/io/java8/ZoneOffsetHandle.java | 11 +--
.../hessian/io/java8/ZonedDateTimeHandle.java | 31 +++---
.../resources/META-INF/dubbo/hessian/deserializers | 3 +
java-8-test/pom.xml | 12 +++
.../hessian/io/java8/HessianDateBenchmark.java | 108 +++++++++++++++++++++
.../hessian/io/java8/Java8TimeSerializerTest.java | 2 +-
.../Java8TimeSerializerUseCompactModeTest.java | 62 ++++++++++++
26 files changed, 475 insertions(+), 196 deletions(-)
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/DurationHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/DurationHandle.java
index 08808e1c..a2e283a8 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/DurationHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/DurationHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.Duration;
@SuppressWarnings("unchecked")
@@ -35,11 +35,9 @@ public class DurationHandle implements HessianHandle, Serializable {
public DurationHandle(Object o) {
try {
- Class c = Class.forName("java.time.Duration");
- Method m = c.getDeclaredMethod("getSeconds");
- this.seconds = (Long) m.invoke(o);
- m = c.getDeclaredMethod("getNano");
- this.nanos = (Integer) m.invoke(o);
+ Duration duration = (Duration) o;
+ this.seconds = duration.getSeconds();
+ this.nanos = duration.getNano();
} catch (Throwable t) {
// ignore
}
@@ -47,9 +45,7 @@ public class DurationHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.Duration");
- Method m = c.getDeclaredMethod("ofSeconds", long.class, long.class);
- return m.invoke(null, seconds, nanos);
+ return Duration.ofSeconds(seconds, nanos);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/InstantHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/InstantHandle.java
index 8165e091..d72214d8 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/InstantHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/InstantHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.Instant;
@SuppressWarnings("unchecked")
public class InstantHandle implements HessianHandle, Serializable {
@@ -34,11 +34,9 @@ public class InstantHandle implements HessianHandle, Serializable {
public InstantHandle(Object o) {
try {
- Class c = Class.forName("java.time.Instant");
- Method m = c.getDeclaredMethod("getEpochSecond");
- this.seconds = (Long) m.invoke(o);
- m = c.getDeclaredMethod("getNano");
- this.nanos = (Integer) m.invoke(o);
+ Instant instant = (Instant) o;
+ this.seconds = instant.getEpochSecond();
+ this.nanos = instant.getNano();
} catch (Throwable t) {
// ignore
}
@@ -47,9 +45,7 @@ public class InstantHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.Instant");
- Method m = c.getDeclaredMethod("ofEpochSecond", long.class, long.class);
- return m.invoke(null, seconds, nanos);
+ return Instant.ofEpochSecond(seconds, nanos);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateDeserializer.java
similarity index 62%
copy from hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
copy to hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateDeserializer.java
index 226a0e35..24de2dd4 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateDeserializer.java
@@ -14,24 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.com.caucho.hessian.io.java8;
-
-import com.alibaba.com.caucho.hessian.io.AbstractHessianOutput;
-import com.alibaba.com.caucho.hessian.io.AbstractSerializer;
+import com.alibaba.com.caucho.hessian.io.AbstractDeserializer;
+import com.alibaba.com.caucho.hessian.io.AbstractHessianInput;
import java.io.IOException;
+import java.time.LocalDate;
-public class LocalTimeSerializer<T> extends AbstractSerializer {
+/**
+ * LocalDateDeserializer
+ */
+public class LocalDateDeserializer extends AbstractDeserializer {
@Override
- public void writeObject(Object obj, AbstractHessianOutput out) throws IOException {
- if (obj == null) {
- out.writeNull();
- return;
- }
-
- out.writeObject(new LocalTimeHandle(obj));
+ public Object readObject(AbstractHessianInput in,
+ Object[] fields)
+ throws IOException {
+ long l = in.readLong();
+ LocalDate localDate = LocalDate.ofEpochDay(l);
+ in.addRef(localDate);
+ return localDate;
}
+
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateHandle.java
index 0592d8c7..25f5fbac 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateHandle.java
@@ -20,28 +20,25 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.LocalDate;
@SuppressWarnings("unchecked")
public class LocalDateHandle implements HessianHandle, Serializable {
private static final long serialVersionUID = 166018689500019951L;
- private int year;
- private int month;
- private int day;
+ int year;
+ int month;
+ int day;
public LocalDateHandle() {
}
public LocalDateHandle(Object o) {
try {
- Class c = Class.forName("java.time.LocalDate");
- Method m = c.getDeclaredMethod("getYear");
- this.year = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getMonthValue");
- this.month = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getDayOfMonth");
- this.day = (Integer) m.invoke(o);
+ LocalDate date = (LocalDate) o;
+ this.year = date.getYear();
+ this.month = date.getMonthValue();
+ this.day = date.getDayOfMonth();
} catch (Throwable t) {
// ignore
}
@@ -49,9 +46,7 @@ public class LocalDateHandle implements HessianHandle, Serializable {
public Object readResolve() {
try {
- Class c = Class.forName("java.time.LocalDate");
- Method m = c.getDeclaredMethod("of", int.class, int.class, int.class);
- return m.invoke(null, year, month, day);
+ return LocalDate.of(year, month, day);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateSerializer.java
index 6956d9de..99c1a0b9 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateSerializer.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateSerializer.java
@@ -22,6 +22,7 @@ import com.alibaba.com.caucho.hessian.io.AbstractHessianOutput;
import com.alibaba.com.caucho.hessian.io.AbstractSerializer;
import java.io.IOException;
+import java.time.LocalDate;
public class LocalDateSerializer<T> extends AbstractSerializer {
@@ -32,6 +33,30 @@ public class LocalDateSerializer<T> extends AbstractSerializer {
return;
}
- out.writeObject(new LocalDateHandle(obj));
+ if (SerializationConfig.isCompactMode()) {
+ if (out.addRef(obj)) {
+ return;
+ }
+
+ Class<?> cl = obj.getClass();
+
+ int ref = out.writeObjectBegin(cl.getName());
+
+ LocalDate localDate = (LocalDate) obj;
+
+ if (ref < -1) {
+ out.writeLong(localDate.toEpochDay());
+ out.writeMapEnd();
+ } else {
+ if (ref == -1) {
+ out.writeInt(0);
+ out.writeObjectBegin(cl.getName());
+ }
+ out.writeLong(localDate.toEpochDay());
+ }
+ } else {
+ out.writeObject(new LocalDateHandle(obj));
+ }
}
+
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeDeserializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeDeserializer.java
new file mode 100755
index 00000000..721a38bf
--- /dev/null
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeDeserializer.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.com.caucho.hessian.io.java8;
+
+import com.alibaba.com.caucho.hessian.io.AbstractDeserializer;
+import com.alibaba.com.caucho.hessian.io.AbstractHessianInput;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+/**
+ * LocalDateTimeDeserializer
+ */
+public class LocalDateTimeDeserializer extends AbstractDeserializer {
+
+ @Override
+ public Object readObject(AbstractHessianInput in,
+ Object[] fieldNames)
+ throws IOException {
+
+ LocalDate localDate = null;
+ LocalTime localTime = null;
+ for (Object fieldName : fieldNames) {
+ if ("date".equals(fieldName)) {
+ localDate = LocalDate.ofEpochDay(in.readLong());
+ } else if ("time".equals(fieldName)) {
+ localTime = LocalTime.ofNanoOfDay(in.readLong());
+ } else {
+ in.readObject();
+ }
+ }
+
+ if (localDate == null || localTime == null) {
+ throw new IOException("Missing required fields for LocalDateTime deserialization: "
+ + "date=" + localDate + ", time=" + localTime);
+ }
+
+ LocalDateTime localDateTime = LocalDateTime.of(localDate, localTime);
+
+ in.addRef(localDateTime);
+ return localDateTime;
+ }
+
+}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeHandle.java
index 603ca46d..4d32a2ab 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeHandle.java
@@ -20,25 +20,25 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
@SuppressWarnings("unchecked")
public class LocalDateTimeHandle implements HessianHandle, Serializable {
private static final long serialVersionUID = 7563825215275989361L;
- private Object date;
- private Object time;
+ private LocalDate date;
+ private LocalTime time;
public LocalDateTimeHandle() {
}
public LocalDateTimeHandle(Object o) {
try {
- Class c = Class.forName("java.time.LocalDateTime");
- Method m = c.getDeclaredMethod("toLocalDate");
- date = m.invoke(o);
- m = c.getDeclaredMethod("toLocalTime");
- time = m.invoke(o);
+ LocalDateTime localDateTime = (LocalDateTime) o;
+ date = localDateTime.toLocalDate();
+ time = localDateTime.toLocalTime();
} catch (Throwable t) {
// ignore
}
@@ -46,10 +46,7 @@ public class LocalDateTimeHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.LocalDateTime");
- Method m = c.getDeclaredMethod("of", Class.forName("java.time.LocalDate"),
- Class.forName("java.time.LocalTime"));
- return m.invoke(null, date, time);
+ return LocalDateTime.of(date, time);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeSerializer.java
index 3c67e8fc..d72848bf 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeSerializer.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalDateTimeSerializer.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.com.caucho.hessian.io.java8;
-
import com.alibaba.com.caucho.hessian.io.AbstractHessianOutput;
import com.alibaba.com.caucho.hessian.io.AbstractSerializer;
import java.io.IOException;
+import java.time.LocalDateTime;
public class LocalDateTimeSerializer<T> extends AbstractSerializer {
@@ -32,6 +31,35 @@ public class LocalDateTimeSerializer<T> extends AbstractSerializer {
return;
}
- out.writeObject(new LocalDateTimeHandle(obj));
+ if (SerializationConfig.isCompactMode()) {
+ if (out.addRef(obj)) {
+ return;
+ }
+
+ Class<?> cl = obj.getClass();
+
+ int ref = out.writeObjectBegin(cl.getName());
+
+ LocalDateTime localDateTime = (LocalDateTime) obj;
+
+ if (ref < -1) {
+ out.writeString("date");
+ out.writeLong(localDateTime.toLocalDate().toEpochDay());
+ out.writeString("time");
+ out.writeLong(localDateTime.toLocalTime().toNanoOfDay());
+ out.writeMapEnd();
+ } else {
+ if (ref == -1) {
+ out.writeInt(2);
+ out.writeString("date");
+ out.writeString("time");
+ out.writeObjectBegin(cl.getName());
+ }
+ out.writeLong(localDateTime.toLocalDate().toEpochDay());
+ out.writeLong(localDateTime.toLocalTime().toNanoOfDay());
+ }
+ } else {
+ out.writeObject(new LocalDateTimeHandle(obj));
+ }
}
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeDeserializer.java
similarity index 63%
copy from hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
copy to hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeDeserializer.java
index 226a0e35..9259c469 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeDeserializer.java
@@ -14,24 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.com.caucho.hessian.io.java8;
-
-import com.alibaba.com.caucho.hessian.io.AbstractHessianOutput;
-import com.alibaba.com.caucho.hessian.io.AbstractSerializer;
+import com.alibaba.com.caucho.hessian.io.AbstractDeserializer;
+import com.alibaba.com.caucho.hessian.io.AbstractHessianInput;
import java.io.IOException;
+import java.time.LocalTime;
-public class LocalTimeSerializer<T> extends AbstractSerializer {
+/**
+ * LocalTimeDeserializer
+ */
+public class LocalTimeDeserializer extends AbstractDeserializer {
@Override
- public void writeObject(Object obj, AbstractHessianOutput out) throws IOException {
- if (obj == null) {
- out.writeNull();
- return;
- }
-
- out.writeObject(new LocalTimeHandle(obj));
+ public Object readObject(AbstractHessianInput in,
+ Object[] fields)
+ throws IOException {
+ LocalTime localTime = LocalTime.ofNanoOfDay(in.readLong());
+ in.addRef(localTime);
+ return localTime;
}
+
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeHandle.java
index 83ebbf64..cc787440 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeHandle.java
@@ -21,7 +21,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.LocalTime;
@SuppressWarnings("unchecked")
public class LocalTimeHandle implements HessianHandle, Serializable {
@@ -37,15 +37,11 @@ public class LocalTimeHandle implements HessianHandle, Serializable {
public LocalTimeHandle(Object o) {
try {
- Class c = Class.forName("java.time.LocalTime");
- Method m = c.getDeclaredMethod("getHour");
- this.hour = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getMinute");
- this.minute = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getSecond");
- this.second = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getNano");
- this.nano = (Integer) m.invoke(o);
+ LocalTime localTime = (LocalTime) o;
+ this.hour = localTime.getHour();
+ this.minute = localTime.getMinute();
+ this.second = localTime.getSecond();
+ this.nano = localTime.getNano();
} catch (Throwable t) {
// ignore
}
@@ -53,9 +49,7 @@ public class LocalTimeHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.LocalTime");
- Method m = c.getDeclaredMethod("of", int.class, int.class, int.class, int.class);
- return m.invoke(null, hour, minute, second, nano);
+ return LocalTime.of(hour, minute, second, nano);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
index 226a0e35..f8c1d09c 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.com.caucho.hessian.io.java8;
-
import com.alibaba.com.caucho.hessian.io.AbstractHessianOutput;
import com.alibaba.com.caucho.hessian.io.AbstractSerializer;
import java.io.IOException;
+import java.time.LocalTime;
public class LocalTimeSerializer<T> extends AbstractSerializer {
@@ -32,6 +31,30 @@ public class LocalTimeSerializer<T> extends AbstractSerializer {
return;
}
- out.writeObject(new LocalTimeHandle(obj));
+ if (SerializationConfig.isCompactMode()) {
+ if (out.addRef(obj)) {
+ return;
+ }
+
+ Class<?> cl = obj.getClass();
+
+ int ref = out.writeObjectBegin(cl.getName());
+
+ LocalTime localTime = (LocalTime) obj;
+
+ if (ref < -1) {
+ out.writeLong(localTime.toNanoOfDay());
+ out.writeMapEnd();
+ } else {
+ if (ref == -1) {
+ out.writeInt(0);
+ out.writeObjectBegin(cl.getName());
+ }
+ out.writeLong(localTime.toNanoOfDay());
+ }
+ } else {
+ out.writeObject(new LocalTimeHandle(obj));
+ }
}
+
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/MonthDayHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/MonthDayHandle.java
index 6daa77e6..d34c74d8 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/MonthDayHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/MonthDayHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.MonthDay;
@SuppressWarnings("unchecked")
public class MonthDayHandle implements HessianHandle, Serializable {
@@ -34,11 +34,9 @@ public class MonthDayHandle implements HessianHandle, Serializable {
public MonthDayHandle(Object o) {
try {
- Class c = Class.forName("java.time.MonthDay");
- Method m = c.getDeclaredMethod("getMonthValue");
- this.month = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getDayOfMonth");
- this.day = (Integer) m.invoke(o);
+ MonthDay monthDay = (MonthDay) o;
+ this.month = monthDay.getMonthValue();
+ this.day = monthDay.getDayOfMonth();
} catch (Throwable t) {
// ignore
}
@@ -46,9 +44,7 @@ public class MonthDayHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.MonthDay");
- Method m = c.getDeclaredMethod("of", int.class, int.class);
- return m.invoke(null, month, day);
+ return MonthDay.of(month, day);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetDateTimeHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetDateTimeHandle.java
index 6ce956f1..916c0661 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetDateTimeHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetDateTimeHandle.java
@@ -20,25 +20,25 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
@SuppressWarnings("unchecked")
public class OffsetDateTimeHandle implements HessianHandle, Serializable {
private static final long serialVersionUID = -7823900532640515312L;
- private Object dateTime;
- private Object offset;
+ private LocalDateTime dateTime;
+ private ZoneOffset offset;
public OffsetDateTimeHandle() {
}
public OffsetDateTimeHandle(Object o) {
try {
- Class c = Class.forName("java.time.OffsetDateTime");
- Method m = c.getDeclaredMethod("toLocalDateTime");
- this.dateTime = m.invoke(o);
- m = c.getDeclaredMethod("getOffset");
- this.offset = m.invoke(o);
+ OffsetDateTime offsetDateTime = (OffsetDateTime) o;
+ this.dateTime = offsetDateTime.toLocalDateTime();
+ this.offset = offsetDateTime.getOffset();
} catch (Throwable t) {
// ignore
}
@@ -47,10 +47,7 @@ public class OffsetDateTimeHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.OffsetDateTime");
- Method m = c.getDeclaredMethod("of", Class.forName("java.time.LocalDateTime"),
- Class.forName("java.time.ZoneOffset"));
- return m.invoke(null, dateTime, offset);
+ return OffsetDateTime.of(dateTime, offset);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetTimeHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetTimeHandle.java
index 8c8236ac..0da5477e 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetTimeHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/OffsetTimeHandle.java
@@ -20,25 +20,25 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.LocalTime;
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
@SuppressWarnings("unchecked")
public class OffsetTimeHandle implements HessianHandle, Serializable {
private static final long serialVersionUID = -3269846941421652860L;
- private Object localTime;
- private Object zoneOffset;
+ private LocalTime localTime;
+ private ZoneOffset zoneOffset;
public OffsetTimeHandle() {
}
public OffsetTimeHandle(Object o) {
try {
- Class c = Class.forName("java.time.OffsetTime");
- Method m = c.getDeclaredMethod("getOffset");
- this.zoneOffset = m.invoke(o);
- m = c.getDeclaredMethod("toLocalTime");
- this.localTime = m.invoke(o);
+ OffsetTime offsetTime = (OffsetTime) o;
+ this.zoneOffset = offsetTime.getOffset();
+ this.localTime = offsetTime.toLocalTime();
} catch (Throwable t) {
// ignore
}
@@ -46,10 +46,7 @@ public class OffsetTimeHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.OffsetTime");
- Method m = c.getDeclaredMethod("of", Class.forName("java.time.LocalTime"),
- Class.forName("java.time.ZoneOffset"));
- return m.invoke(null, localTime, zoneOffset);
+ return OffsetTime.of(localTime, zoneOffset);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/PeriodHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/PeriodHandle.java
index 6586525f..c5e00828 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/PeriodHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/PeriodHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.Period;
@SuppressWarnings("unchecked")
@@ -36,13 +36,10 @@ public class PeriodHandle implements HessianHandle, Serializable {
public PeriodHandle(Object o) {
try {
- Class c = Class.forName("java.time.Period");
- Method m = c.getDeclaredMethod("getYears");
- this.years = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getMonths");
- this.months = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getDays");
- this.days = (Integer) m.invoke(o);
+ Period period = (Period) o;
+ this.years = period.getYears();
+ this.months = period.getMonths();
+ this.days = period.getDays();
} catch (Throwable t) {
// ignore
}
@@ -50,9 +47,7 @@ public class PeriodHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.Period");
- Method m = c.getDeclaredMethod("of", int.class, int.class, int.class);
- return m.invoke(null, years, months, days);
+ return Period.of(years, months, days);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/SerializationConfig.java
old mode 100755
new mode 100644
similarity index 51%
copy from hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
copy to hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/SerializationConfig.java
index 226a0e35..4bfaca14
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/LocalTimeSerializer.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/SerializationConfig.java
@@ -14,24 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.com.caucho.hessian.io.java8;
+/**
+ * SerializationConfig
+ */
+public class SerializationConfig {
-import com.alibaba.com.caucho.hessian.io.AbstractHessianOutput;
-import com.alibaba.com.caucho.hessian.io.AbstractSerializer;
-
-import java.io.IOException;
-
-public class LocalTimeSerializer<T> extends AbstractSerializer {
+ /**
+ * Whether to use compact mode for serialization, default false.
+ * use -Dcom.caucho.hessian.io.java.time.serializer.compactMode=true to enable compact mode.
+ */
+ private static boolean compactMode = Boolean.getBoolean("com.caucho.hessian.io.java.time.serializer.compactMode");
+
+ private SerializationConfig() {
+ }
- @Override
- public void writeObject(Object obj, AbstractHessianOutput out) throws IOException {
- if (obj == null) {
- out.writeNull();
- return;
- }
+ /**
+ * Checks if compact mode is enabled for serialization.
+ * @return true if compact mode is enabled, false otherwise.
+ */
+ public static boolean isCompactMode() {
+ return compactMode;
+ }
- out.writeObject(new LocalTimeHandle(obj));
+ /**
+ * For compatibility test.
+ */
+ protected static void setCompactMode(boolean compactMode) {
+ SerializationConfig.compactMode = compactMode;
}
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearHandle.java
index 1da8be80..ec3eb321 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.Year;
@SuppressWarnings("unchecked")
public class YearHandle implements HessianHandle, Serializable {
@@ -33,9 +33,8 @@ public class YearHandle implements HessianHandle, Serializable {
public YearHandle(Object o) {
try {
- Class c = Class.forName("java.time.Year");
- Method m = c.getDeclaredMethod("getValue");
- this.year = (Integer) m.invoke(o);
+ Year yearObj = (Year) o;
+ this.year = yearObj.getValue();
} catch (Throwable t) {
// ignore
}
@@ -44,9 +43,7 @@ public class YearHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.Year");
- Method m = c.getDeclaredMethod("of", int.class);
- return m.invoke(null, year);
+ return Year.of(year);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearMonthHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearMonthHandle.java
index a17d3257..686dd273 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearMonthHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/YearMonthHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.YearMonth;
@SuppressWarnings("unchecked")
public class YearMonthHandle implements HessianHandle, Serializable {
@@ -34,11 +34,9 @@ public class YearMonthHandle implements HessianHandle, Serializable {
public YearMonthHandle(Object o) {
try {
- Class c = Class.forName("java.time.YearMonth");
- Method m = c.getDeclaredMethod("getYear");
- this.year = (Integer) m.invoke(o);
- m = c.getDeclaredMethod("getMonthValue");
- this.month = (Integer) m.invoke(o);
+ YearMonth yearMonth = (YearMonth) o;
+ this.year = yearMonth.getYear();
+ this.month = yearMonth.getMonthValue();
} catch (Throwable t) {
// ignore
}
@@ -46,9 +44,7 @@ public class YearMonthHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.YearMonth");
- Method m = c.getDeclaredMethod("of", int.class, int.class);
- return m.invoke(null, year, month);
+ return YearMonth.of(year, month);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneIdHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneIdHandle.java
index e4ad2624..22a81e62 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneIdHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneIdHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.ZoneId;
@SuppressWarnings("unchecked")
public class ZoneIdHandle implements HessianHandle, Serializable {
@@ -34,9 +34,8 @@ public class ZoneIdHandle implements HessianHandle, Serializable {
public ZoneIdHandle(Object o) {
try {
- Class c = Class.forName("java.time.ZoneId");
- Method m = c.getDeclaredMethod("getId");
- this.zoneId = (String) m.invoke(o);
+ ZoneId zoneIdObj = (ZoneId) o;
+ this.zoneId = zoneIdObj.getId();
} catch (Throwable t) {
// ignore
}
@@ -44,9 +43,7 @@ public class ZoneIdHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.ZoneId");
- Method m = c.getDeclaredMethod("of", String.class);
- return m.invoke(null, this.zoneId);
+ return ZoneId.of(this.zoneId);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneOffsetHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneOffsetHandle.java
index 1050548b..03257e5d 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneOffsetHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZoneOffsetHandle.java
@@ -20,7 +20,7 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.ZoneOffset;
@SuppressWarnings("unchecked")
public class ZoneOffsetHandle implements HessianHandle, Serializable {
@@ -33,9 +33,8 @@ public class ZoneOffsetHandle implements HessianHandle, Serializable {
public ZoneOffsetHandle(Object o) {
try {
- Class c = Class.forName("java.time.ZoneOffset");
- Method m = c.getDeclaredMethod("getTotalSeconds");
- this.seconds = (Integer) m.invoke(o);
+ ZoneOffset zoneOffset = (ZoneOffset) o;
+ this.seconds = zoneOffset.getTotalSeconds();
} catch (Throwable t) {
// ignore
}
@@ -43,9 +42,7 @@ public class ZoneOffsetHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class c = Class.forName("java.time.ZoneOffset");
- Method m = c.getDeclaredMethod("ofTotalSeconds", int.class);
- return m.invoke(null, seconds);
+ return ZoneOffset.ofTotalSeconds(seconds);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZonedDateTimeHandle.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZonedDateTimeHandle.java
index fa9c27f6..57f87b32 100755
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZonedDateTimeHandle.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/java8/ZonedDateTimeHandle.java
@@ -20,14 +20,17 @@ package com.alibaba.com.caucho.hessian.io.java8;
import com.alibaba.com.caucho.hessian.io.HessianHandle;
import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
@SuppressWarnings("unchecked")
public class ZonedDateTimeHandle implements HessianHandle, Serializable {
private static final long serialVersionUID = -6933460123278647569L;
- private Object dateTime;
- private Object offset;
+ private LocalDateTime dateTime;
+ private ZoneOffset offset;
private String zoneId;
@@ -36,17 +39,12 @@ public class ZonedDateTimeHandle implements HessianHandle, Serializable {
public ZonedDateTimeHandle(Object o) {
try {
- Class c = Class.forName("java.time.ZonedDateTime");
- Method m = c.getDeclaredMethod("toLocalDateTime");
- this.dateTime = m.invoke(o);
- m = c.getDeclaredMethod("getOffset");
- this.offset = m.invoke(o);
- m = c.getDeclaredMethod("getZone");
- Object zone = m.invoke(o);
+ ZonedDateTime zonedDateTime = (ZonedDateTime) o;
+ this.dateTime = zonedDateTime.toLocalDateTime();
+ this.offset = zonedDateTime.getOffset();
+ ZoneId zone = zonedDateTime.getZone();
if (zone != null) {
- Class zoneId = Class.forName("java.time.ZoneId");
- m = zoneId.getDeclaredMethod("getId");
- this.zoneId = (String) m.invoke(zone);
+ this.zoneId = zone.getId();
}
} catch (Throwable t) {
// ignore
@@ -55,12 +53,7 @@ public class ZonedDateTimeHandle implements HessianHandle, Serializable {
private Object readResolve() {
try {
- Class zoneDateTime = Class.forName("java.time.ZonedDateTime");
- Method ofLocal = zoneDateTime.getDeclaredMethod("ofLocal", Class.forName("java.time.LocalDateTime"),
- Class.forName("java.time.ZoneId"), Class.forName("java.time.ZoneOffset"));
- Class c = Class.forName("java.time.ZoneId");
- Method of = c.getDeclaredMethod("of", String.class);
- return ofLocal.invoke(null, dateTime, of.invoke(null, this.zoneId), offset);
+ return ZonedDateTime.ofLocal(dateTime, ZoneId.of(zoneId), offset);
} catch (Throwable t) {
// ignore
}
diff --git a/hessian-lite/src/main/resources/META-INF/dubbo/hessian/deserializers b/hessian-lite/src/main/resources/META-INF/dubbo/hessian/deserializers
index 03840e6d..0de889d3 100644
--- a/hessian-lite/src/main/resources/META-INF/dubbo/hessian/deserializers
+++ b/hessian-lite/src/main/resources/META-INF/dubbo/hessian/deserializers
@@ -12,3 +12,6 @@ java.net.URI=com.alibaba.com.caucho.hessian.io.socket.URIDeserializer
java.time.temporal.WeekFields=com.alibaba.com.caucho.hessian.io.java8.WeekFieldsDeserializer
java.util.UUID=com.alibaba.com.caucho.hessian.io.UUIDDeserializer
java.util.Currency=com.alibaba.com.caucho.hessian.io.CurrencyDeserializer
+java.time.LocalDate=com.alibaba.com.caucho.hessian.io.java8.LocalDateDeserializer
+java.time.LocalDateTime=com.alibaba.com.caucho.hessian.io.java8.LocalDateTimeDeserializer
+java.time.LocalTime=com.alibaba.com.caucho.hessian.io.java8.LocalTimeDeserializer
\ No newline at end of file
diff --git a/java-8-test/pom.xml b/java-8-test/pom.xml
index fe54d371..f5d6f2ba 100644
--- a/java-8-test/pom.xml
+++ b/java-8-test/pom.xml
@@ -39,6 +39,18 @@
<version>4.0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-core</artifactId>
+ <version>1.37</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-generator-annprocess</artifactId>
+ <version>1.37</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/HessianDateBenchmark.java b/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/HessianDateBenchmark.java
new file mode 100644
index 00000000..b0992d8a
--- /dev/null
+++ b/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/HessianDateBenchmark.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.com.caucho.hessian.io.java8;
+
+import com.alibaba.com.caucho.hessian.io.base.SerializeTestBase;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * HessianDateBenchmark
+ */
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup
+@Fork(1)
+public abstract class HessianDateBenchmark extends SerializeTestBase {
+
+ public static void main(String[] args) throws RunnerException {
+ Options opt = new OptionsBuilder()
+ .include(HessianDateBenchmark.class.getSimpleName())
+ .build();
+
+ new Runner(opt).run();
+ }
+
+ @State(Scope.Thread)
+ public static class JavaUtilDateBenchmark extends HessianDateBenchmark {
+ protected Date javaUtilDate;
+ @Setup
+ public void setup() {
+ javaUtilDate = new Date();
+ }
+ @Benchmark
+ public Object serializeDeserializeJavaUtilDate() throws Exception {
+ return baseHessian2Serialize(javaUtilDate);
+ }
+ }
+
+ @State(Scope.Thread)
+ public static class LocalDateTimeBenchmark extends HessianDateBenchmark {
+ @Param({"true", "false"})
+ public String compactMode;
+
+ protected LocalDateTime javaTimeLocalDateTime;
+
+ @Setup(Level.Iteration)
+ public void setUp() {
+ javaTimeLocalDateTime = LocalDateTime.now();
+ System.setProperty("com.caucho.hessian.io.java.time.serializer.compactMode", compactMode);
+ }
+
+ @Benchmark
+ public Object serializeDeserializeLocalDateTime() throws Exception {
+ return baseHessian2Serialize(javaTimeLocalDateTime);
+ }
+ }
+
+ @State(Scope.Thread)
+ public static class LocalDateBenchmark extends HessianDateBenchmark {
+ protected LocalDate javaTimeLocalDate;
+
+ @Param({"true", "false"})
+ public String compactMode;
+
+ @Setup(Level.Iteration)
+ public void setUp() {
+ javaTimeLocalDate = LocalDate.now();
+ System.setProperty("com.caucho.hessian.io.java.time.serializer.compactMode", compactMode);
+ }
+
+ @Benchmark
+ public Object serializeDeserializeLocalDate() throws Exception {
+ return baseHessian2Serialize(javaTimeLocalDate);
+ }
+ }
+}
diff --git a/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerTest.java b/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerTest.java
index 16cd806f..9a743505 100644
--- a/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerTest.java
+++ b/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerTest.java
@@ -152,7 +152,7 @@ public class Java8TimeSerializerTest extends SerializeTestBase {
testJava8Time(ChronoPeriod.between(ThaiBuddhistDate.now(), ThaiBuddhistDate.now()));
}
- private void testJava8Time(Object expected) throws IOException {
+ protected void testJava8Time(Object expected) throws IOException {
Assertions.assertEquals(expected, baseHessian2Serialize(expected));
if (expected instanceof Chronology || expected instanceof ChronoPeriod || expected instanceof JapaneseDate
|| expected instanceof HijrahDate || expected instanceof MinguoDate || expected instanceof ThaiBuddhistDate) {
diff --git a/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerUseCompactModeTest.java b/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerUseCompactModeTest.java
new file mode 100644
index 00000000..333086f9
--- /dev/null
+++ b/java-8-test/src/test/java/com/alibaba/com/caucho/hessian/io/java8/Java8TimeSerializerUseCompactModeTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.com.caucho.hessian.io.java8;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.chrono.ChronoPeriod;
+import java.time.chrono.Chronology;
+import java.time.chrono.HijrahDate;
+import java.time.chrono.JapaneseDate;
+import java.time.chrono.MinguoDate;
+import java.time.chrono.ThaiBuddhistDate;
+
+/**
+ * Test Java8TimeSerializer class use compact mode
+ */
+public class Java8TimeSerializerUseCompactModeTest extends Java8TimeSerializerTest {
+
+ @BeforeAll
+ public static void setUp() {
+ SerializationConfig.setCompactMode(true);
+ }
+
+ @AfterAll
+ public static void tearDown() {
+ SerializationConfig.setCompactMode(false);
+ }
+
+ @Test
+ public void testLocalDate() throws Exception {
+ testJava8Time(LocalDate.now());
+ }
+
+ protected void testJava8Time(Object expected) throws IOException {
+ Assertions.assertEquals(expected, baseHessian2Serialize(expected));
+ if (expected instanceof Chronology || expected instanceof ChronoPeriod || expected instanceof JapaneseDate
+ || expected instanceof HijrahDate || expected instanceof MinguoDate || expected instanceof ThaiBuddhistDate) {
+ return;
+ }
+ Assertions.assertEquals(expected, hessian3ToHessian3(expected));
+ Assertions.assertEquals(expected, hessian3ToHessian4(expected));
+ }
+}