This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-hessian-lite.git
commit e6b760447ca7529cac23c2788549326ed8a02893 Merge: ca001b46 20cf1cd6 Author: Ken Liu <[email protected]> AuthorDate: Fri Mar 22 15:01:11 2024 +0800 Merge pull request #69 from AlbumenJ/merge/hessian4 Merge hessian4 into hessian-lite .github/workflows/maven.yml | 8 +- NOTICE | 4 +- pom.xml | 10 +- ...OExceptionWrapper.java => HessianUnshared.java} | 38 +- .../caucho/hessian/io/AbstractDeserializer.java | 83 ++- ...lizer.java => AbstractDeserializerWrapper.java} | 71 +- .../caucho/hessian/io/AbstractHessianInput.java | 120 ++-- .../caucho/hessian/io/AbstractHessianOutput.java | 118 +++- .../hessian/io/AbstractListDeserializer.java | 1 - .../caucho/hessian/io/AbstractMapDeserializer.java | 2 - .../com/caucho/hessian/io/AbstractSerializer.java | 84 ++- ...ializer.java => AbstractSerializerWrapper.java} | 18 +- ...alizer.java => AbstractStreamDeserializer.java} | 33 +- ...rializer.java => AbstractStreamSerializer.java} | 91 ++- ...r.java => AbstractStringValueDeserializer.java} | 35 +- ...serializer.java => AnnotationDeserializer.java} | 106 ++- ...lizer.java => AnnotationInvocationHandler.java} | 93 ++- .../caucho/hessian/io/AnnotationSerializer.java | 367 ++++++++++ .../com/caucho/hessian/io/ArrayDeserializer.java | 4 - .../com/caucho/hessian/io/ArraySerializer.java | 1 - .../com/caucho/hessian/io/BasicDeserializer.java | 8 +- .../com/caucho/hessian/io/BasicSerializer.java | 57 +- .../com/caucho/hessian/io/BeanDeserializer.java | 7 +- ...serializer.java => BigDecimalDeserializer.java} | 16 +- .../com/caucho/hessian/io/BitSetSerializer.java | 1 + ...bleSerializer.java => ByteArraySerializer.java} | 22 +- .../{ThrowableSerializer.java => ByteHandle.java} | 29 +- .../com/caucho/hessian/io/CalendarSerializer.java | 22 +- .../com/caucho/hessian/io/ClassDeserializer.java | 7 +- .../com/caucho/hessian/io/ClassFactory.java | 147 ++-- .../com/caucho/hessian/io/ClassSerializer.java | 1 - .../caucho/hessian/io/CollectionDeserializer.java | 42 +- .../caucho/hessian/io/CollectionSerializer.java | 23 +- .../hessian/io/ContextSerializerFactory.java | 481 +++++++++++++ .../com/caucho/hessian/io/Deserializer.java | 61 +- .../com/caucho/hessian/io/EnumDeserializer.java | 5 +- .../com/caucho/hessian/io/EnumSerializer.java | 3 +- .../caucho/hessian/io/EnumerationDeserializer.java | 1 - .../caucho/hessian/io/EnumerationSerializer.java | 1 - ...amDeserializer.java => FieldDeserializer2.java} | 16 +- .../hessian/io/FieldDeserializer2Factory.java | 457 ++++++++++++ .../io/FieldDeserializer2FactoryUnsafe.java | 527 ++++++++++++++ ...{EnvelopeFactory.java => FileDeserializer.java} | 18 +- .../{ThrowableSerializer.java => FloatHandle.java} | 29 +- .../com/caucho/hessian/io/Hessian2Input.java | 768 ++++++++++++--------- .../com/caucho/hessian/io/Hessian2Output.java | 486 ++++++++----- .../caucho/hessian/io/Hessian2StreamingInput.java | 169 ++++- .../caucho/hessian/io/Hessian2StreamingOutput.java | 8 + .../com/caucho/hessian/io/HessianFactory.java | 217 ++++++ ...va => HessianMethodSerializationException.java} | 37 +- .../hessian/io/HessianProtocolException.java | 1 - .../com/caucho/hessian/io/HessianRemote.java | 7 +- .../com/caucho/hessian/io/IOExceptionWrapper.java | 1 - ...EnvelopeFactory.java => InetAddressHandle.java} | 30 +- ...eSerializer.java => InetAddressSerializer.java} | 14 +- .../caucho/hessian/io/InputStreamDeserializer.java | 4 +- .../caucho/hessian/io/InputStreamSerializer.java | 10 +- ...Deserializer.java => IteratorDeserializer.java} | 14 +- .../com/caucho/hessian/io/IteratorSerializer.java | 1 - .../com/caucho/hessian/io/JavaDeserializer.java | 677 +++++------------- .../com/caucho/hessian/io/JavaSerializer.java | 177 +++-- ...Serializer.java => JavaUnsharedSerializer.java} | 22 +- .../com/caucho/hessian/io/LocaleHandle.java | 1 + .../com/caucho/hessian/io/LocaleSerializer.java | 1 + .../com/caucho/hessian/io/MapDeserializer.java | 49 +- .../com/caucho/hessian/io/MapSerializer.java | 23 +- .../com/caucho/hessian/io/ObjectDeserializer.java | 9 +- ...Serializer.java => ObjectHandleSerializer.java} | 18 +- ...ionWrapper.java => ObjectNameDeserializer.java} | 33 +- ...{EnvelopeFactory.java => ObjectSerializer.java} | 12 +- ...apDeserializer.java => RemoteDeserializer.java} | 35 +- .../com/caucho/hessian/io/RemoteSerializer.java | 7 +- .../com/caucho/hessian/io/SerializerFactory.java | 531 +++++++------- .../{ThrowableSerializer.java => ShortHandle.java} | 29 +- .../com/caucho/hessian/io/SqlDateDeserializer.java | 21 +- .../com/caucho/hessian/io/SqlDateSerializer.java | 1 - .../hessian/io/StackTraceElementDeserializer.java | 11 +- .../caucho/hessian/io/StringValueDeserializer.java | 50 +- .../caucho/hessian/io/StringValueSerializer.java | 3 +- .../com/caucho/hessian/io/ThrowableSerializer.java | 15 +- .../com/caucho/hessian/io/UnsafeDeserializer.java | 374 ++++++++++ .../com/caucho/hessian/io/UnsafeSerializer.java | 522 ++++++++++++++ ...rializer.java => UnsafeUnsharedSerializer.java} | 22 +- .../com/caucho/hessian/io/ValueDeserializer.java | 2 - .../caucho/hessian/io/WriteReplaceSerializer.java | 186 +++++ ...neIdSerializer.java => DurationSerializer.java} | 15 +- ...oneIdSerializer.java => InstantSerializer.java} | 15 +- ...eIdSerializer.java => LocalDateSerializer.java} | 15 +- ...erializer.java => LocalDateTimeSerializer.java} | 15 +- ...eIdSerializer.java => LocalTimeSerializer.java} | 15 +- ...neIdSerializer.java => MonthDaySerializer.java} | 15 +- ...rializer.java => OffsetDateTimeSerializer.java} | 15 +- ...IdSerializer.java => OffsetTimeSerializer.java} | 15 +- ...ZoneIdSerializer.java => PeriodSerializer.java} | 15 +- ...eIdSerializer.java => YearMonthSerializer.java} | 15 +- .../{ZoneIdSerializer.java => YearSerializer.java} | 15 +- .../caucho/hessian/io/java8/ZoneIdSerializer.java | 1 + ...IdSerializer.java => ZoneOffsetSerializer.java} | 15 +- ...erializer.java => ZonedDateTimeSerializer.java} | 15 +- .../HessianFreeList.java} | 91 ++- .../com/caucho/hessian/util/IdentityIntMap.java | 171 ++--- .../alibaba/com/caucho/hessian/util/IntMap.java | 163 ++--- .../resources/META-INF/dubbo/hessian/deserializers | 3 + .../resources/META-INF/dubbo/hessian/serializers | 18 + .../caucho/hessian/io/BitSetSerializerTest.java | 3 +- .../hessian/io/CollectionSerializerTest.java | 6 +- .../caucho/hessian/io/Hessian1StringShortTest.java | 210 ------ .../caucho/hessian/io/Hessian2StringShortTest.java | 9 +- .../hessian/io/HessianJavaSerializeTest.java | 7 +- .../caucho/hessian/io/LocaleSerializerTest.java | 3 +- .../caucho/hessian/io/base/SerializeTestBase.java | 21 - .../com/caucho/hessian3/HessianException.java} | 38 +- .../caucho/hessian3}/io/AbstractDeserializer.java | 2 +- .../caucho/hessian3}/io/AbstractHessianInput.java | 2 +- .../caucho/hessian3}/io/AbstractHessianOutput.java | 2 +- .../hessian3}/io/AbstractHessianResolver.java | 2 +- .../hessian3}/io/AbstractListDeserializer.java | 2 +- .../hessian3}/io/AbstractMapDeserializer.java | 2 +- .../caucho/hessian3}/io/AbstractSerializer.java | 2 +- .../hessian3/io/AbstractSerializerFactory.java} | 45 +- .../com/caucho/hessian3}/io/ArrayDeserializer.java | 2 +- .../com/caucho/hessian3}/io/ArraySerializer.java | 2 +- .../com/caucho/hessian3}/io/BasicDeserializer.java | 2 +- .../com/caucho/hessian3}/io/BasicSerializer.java | 2 +- .../com/caucho/hessian3}/io/BeanDeserializer.java | 2 +- .../com/caucho/hessian3}/io/BeanSerializer.java | 2 +- .../caucho/hessian3}/io/BeanSerializerFactory.java | 2 +- .../hessian3}/io/BigIntegerDeserializer.java | 2 +- .../com/caucho/hessian3/io/BitSetHandle.java} | 26 +- .../com/caucho/hessian3}/io/BitSetSerializer.java | 2 +- .../com/caucho/hessian3/io/CalendarHandle.java} | 46 +- .../caucho/hessian3}/io/CalendarSerializer.java | 2 +- .../com/caucho/hessian3}/io/ClassDeserializer.java | 2 +- .../com/caucho/hessian3}/io/ClassFactory.java | 4 +- .../com/caucho/hessian3}/io/ClassSerializer.java | 2 +- .../hessian3}/io/CollectionDeserializer.java | 2 +- .../caucho/hessian3}/io/CollectionSerializer.java | 2 +- .../alibaba/com/caucho/hessian3}/io/Deflation.java | 2 +- .../com/caucho/hessian3}/io/Deserializer.java | 2 +- .../com/caucho/hessian3}/io/EnumDeserializer.java | 2 +- .../com/caucho/hessian3}/io/EnumSerializer.java | 2 +- .../com/caucho/hessian3}/io/EnumSetHandler.java | 2 +- .../com/caucho/hessian3}/io/EnumSetSerializer.java | 2 +- .../hessian3}/io/EnumerationDeserializer.java | 2 +- .../caucho/hessian3}/io/EnumerationSerializer.java | 2 +- .../com/caucho/hessian3}/io/EnvelopeFactory.java | 2 +- .../caucho/hessian3}/io/ExtSerializerFactory.java | 2 +- .../com/caucho/hessian3/io/Hessian2Constants.java | 145 ++++ .../com/caucho/hessian3}/io/Hessian2Input.java | 2 +- .../com/caucho/hessian3}/io/Hessian2Output.java | 4 +- .../hessian3}/io/Hessian2StreamingInput.java | 2 +- .../hessian3}/io/Hessian2StreamingOutput.java | 2 +- .../hessian3}/io/HessianDebugInputStream.java | 2 +- .../hessian3}/io/HessianDebugOutputStream.java | 2 +- .../com/caucho/hessian3}/io/HessianDebugState.java | 2 +- .../com/caucho/hessian3}/io/HessianEnvelope.java | 2 +- .../caucho/hessian3/io/HessianFieldException.java} | 37 +- .../com/caucho/hessian3/io/HessianHandle.java} | 11 +- .../com/caucho/hessian3}/io/HessianInput.java | 2 +- .../caucho/hessian3}/io/HessianInputFactory.java | 2 +- .../com/caucho/hessian3}/io/HessianOutput.java | 2 +- .../hessian3}/io/HessianProtocolException.java | 2 +- .../com/caucho/hessian3}/io/HessianRemote.java | 2 +- .../caucho/hessian3/io/HessianRemoteObject.java} | 12 +- .../caucho/hessian3/io/HessianRemoteResolver.java} | 9 +- .../hessian3}/io/HessianSerializerInput.java | 2 +- .../hessian3}/io/HessianSerializerOutput.java | 2 +- .../hessian3/io/HessianServiceException.java} | 42 +- .../caucho/hessian3}/io/IOExceptionWrapper.java | 2 +- .../hessian3}/io/InputStreamDeserializer.java | 2 +- .../caucho/hessian3}/io/InputStreamSerializer.java | 2 +- .../caucho/hessian3}/io/IteratorSerializer.java | 2 +- .../com/caucho/hessian3}/io/JavaDeserializer.java | 2 +- .../com/caucho/hessian3}/io/JavaSerializer.java | 2 +- .../com/caucho/hessian3}/io/LocaleHandle.java | 2 +- .../com/caucho/hessian3}/io/LocaleSerializer.java | 2 +- .../com/caucho/hessian3}/io/MapDeserializer.java | 2 +- .../com/caucho/hessian3}/io/MapSerializer.java | 2 +- .../caucho/hessian3}/io/ObjectDeserializer.java | 2 +- .../com/caucho/hessian3}/io/RemoteSerializer.java | 2 +- .../com/caucho/hessian3/io/Serializer.java} | 15 +- .../com/caucho/hessian3}/io/SerializerFactory.java | 34 +- .../caucho/hessian3}/io/SqlDateDeserializer.java | 2 +- .../com/caucho/hessian3}/io/SqlDateSerializer.java | 2 +- .../io/StackTraceElementDeserializer.java | 2 +- .../hessian3}/io/StringValueDeserializer.java | 2 +- .../caucho/hessian3}/io/StringValueSerializer.java | 2 +- .../caucho/hessian3}/io/ThrowableSerializer.java | 2 +- .../com/caucho/hessian3}/io/UUIDDeserializer.java | 2 +- .../com/caucho/hessian3}/io/ValueDeserializer.java | 2 +- .../caucho/hessian3/io/java8/DurationHandle.java | 58 ++ .../caucho/hessian3/io/java8/InstantHandle.java | 58 ++ .../hessian3}/io/java8/Java8TimeSerializer.java | 6 +- .../caucho/hessian3/io/java8/LocalDateHandle.java | 60 ++ .../hessian3/io/java8/LocalDateTimeHandle.java | 58 ++ .../caucho/hessian3/io/java8/LocalTimeHandle.java | 64 ++ .../caucho/hessian3/io/java8/MonthDayHandle.java | 57 ++ .../hessian3/io/java8/OffsetDateTimeHandle.java | 59 ++ .../caucho/hessian3/io/java8/OffsetTimeHandle.java | 58 ++ .../com/caucho/hessian3/io/java8/PeriodHandle.java | 61 ++ .../com/caucho/hessian3/io/java8/YearHandle.java | 55 ++ .../caucho/hessian3/io/java8/YearMonthHandle.java | 57 ++ .../com/caucho/hessian3/io/java8/ZoneIdHandle.java | 55 ++ .../hessian3}/io/java8/ZoneIdSerializer.java | 6 +- .../caucho/hessian3/io/java8/ZoneOffsetHandle.java | 54 ++ .../hessian3/io/java8/ZonedDateTimeHandle.java | 69 ++ .../caucho/hessian3}/security/X509Encryption.java | 8 +- .../caucho/hessian3}/security/X509Signature.java | 8 +- .../com/caucho/hessian3}/util/IdentityIntMap.java | 2 +- .../alibaba/com/caucho/hessian3}/util/IntMap.java | 2 +- 210 files changed, 7248 insertions(+), 2972 deletions(-)
