Merge remote-tracking branch 'origin/master'

did-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>did-parent</artifactId>
         <groupId>io.github.ehlxr</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,6 +25,18 @@
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-runtime</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.caucho</groupId>
+            <artifactId>hessian</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

did-core/src/main/java/io/github/ehlxr/did/SdkProto.java

@@ -1,3 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright © 2020 xrv <xrg@live.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package io.github.ehlxr.did;
 
 import io.github.ehlxr.did.common.JsonUtils;

did-core/src/main/java/io/github/ehlxr/did/adapter/Message.java

@@ -24,9 +24,6 @@
 
 package io.github.ehlxr.did.adapter;
 
-import io.github.ehlxr.did.common.Try;
-import io.github.ehlxr.did.serializer.SerializerHolder;
-
 import java.io.Serializable;
 
 /**
@@ -56,12 +53,6 @@ public class Message<T> implements Serializable {
      */
     private T content;
 
-    public Message(byte type, byte flag, T content) {
-        this.type = type;
-        this.flag = flag;
-        this.content = content;
-    }
-
     public Message() {
     }
 
@@ -86,21 +77,21 @@ public class Message<T> implements Serializable {
     }
 
     public int getLength() {
-        return getContent().length;
+        return length;
     }
 
-    public byte[] getContent() {
-        return Try.<T, byte[]>of(SerializerHolder.get()::serializer).apply(content).get();
+    public void setLength(int length) {
+        this.length = length;
+    }
+
+    public T getContent() {
+        return content;
     }
 
     public void setContent(T content) {
         this.content = content;
     }
 
-    public T content(Class<T> clazz) {
-        return SerializerHolder.get().deserializer(getContent(), clazz);
-    }
-
     @Override
     public String toString() {
         return "Message{" +
@@ -114,6 +105,7 @@ public class Message<T> implements Serializable {
     public static final class MessageBuilder<T> {
         private byte type;
         private byte flag;
+        private int length;
         private T content;
 
         private MessageBuilder() {
@@ -129,6 +121,11 @@ public class Message<T> implements Serializable {
             return this;
         }
 
+        public MessageBuilder<T> length(int length) {
+            this.length = length;
+            return this;
+        }
+
         public MessageBuilder<T> content(T content) {
             this.content = content;
             return this;
@@ -138,6 +135,7 @@ public class Message<T> implements Serializable {
             Message<T> message = new Message<>();
             message.setType(type);
             message.setFlag(flag);
+            message.setLength(length);
             message.setContent(content);
             return message;
         }

did-core/src/main/java/io/github/ehlxr/did/adapter/MessageDecoder.java

@@ -91,6 +91,7 @@ public class MessageDecoder extends LengthFieldBasedFrameDecoder {
         return Message.newBuilder()
                 .type(type)
                 .flag(flag)
+                .length(bytes.length)
                 .content(SerializerHolder.get().deserializer(bytes, SdkProto.class))
                 .build();
     }

did-core/src/main/java/io/github/ehlxr/did/adapter/MessageEncoder.java

@@ -25,6 +25,8 @@
 package io.github.ehlxr.did.adapter;
 
 import io.github.ehlxr.did.SdkProto;
+import io.github.ehlxr.did.common.Try;
+import io.github.ehlxr.did.serializer.SerializerHolder;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
@@ -40,11 +42,13 @@ public class MessageEncoder extends MessageToByteEncoder<Message<SdkProto>> {
     @Override
     protected void encode(ChannelHandlerContext ctx, Message<SdkProto> msg, ByteBuf out) {
         Objects.requireNonNull(msg, "encode failed 'cause of recive message is null");
+        SdkProto content = msg.getContent();
+        byte[] bytes = Try.<SdkProto, byte[]>of(SerializerHolder.get()::serializer).apply(content).get();
 
         out.writeByte(msg.getType());
         out.writeByte(msg.getFlag());
-        out.writeInt(msg.getLength());
-        out.writeBytes(msg.getContent());
+        out.writeInt(bytes.length);
+        out.writeBytes(bytes);
     }
 }
 

did-core/src/main/java/io/github/ehlxr/did/serializer/Serializer.java

@@ -1,3 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright © 2020 xrv <xrg@live.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package io.github.ehlxr.did.serializer;
 
 import io.github.ehlxr.did.extension.SPI;

did-core/src/main/java/io/github/ehlxr/did/serializer/SerializerHolder.java

@@ -1,3 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright © 2020 xrv <xrg@live.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package io.github.ehlxr.did.serializer;
 
 import io.github.ehlxr.did.common.Constants;

did-core/src/main/java/io/github/ehlxr/did/serializer/impl/HessianSerializer.java

@@ -0,0 +1,70 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright © 2020 xrv <xrg@live.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package io.github.ehlxr.did.serializer.impl;
+
+import com.caucho.hessian.io.HessianInput;
+import com.caucho.hessian.io.HessianOutput;
+import io.github.ehlxr.did.common.Try;
+import io.github.ehlxr.did.serializer.Serializer;
+import io.protostuff.LinkedBuffer;
+import io.protostuff.ProtostuffIOUtil;
+import io.protostuff.Schema;
+import io.protostuff.runtime.RuntimeSchema;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author ehlxr
+ * @since 2021-02-09 11:07.
+ */
+public class HessianSerializer implements Serializer {
+    @Override
+    public <T> byte[] serializer(T obj) {
+        return Try.<T, byte[]>of(o -> {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            HessianOutput ho = new HessianOutput(bos);
+            ho.writeObject(obj);
+            ho.flush();
+
+            return bos.toByteArray();
+        }).trap(Throwable::printStackTrace).apply(obj).get();
+    }
+
+    @Override
+    public <T> T deserializer(byte[] bytes, Class<T> clazz) {
+        return Try.<byte[], T>of(bs -> {
+            ByteArrayInputStream bis = new ByteArrayInputStream(bs);
+            HessianInput hi = new HessianInput(bis);
+
+            Object o = hi.readObject();
+            return clazz.isInstance(o) ? clazz.cast(o) : null;
+        }).trap(Throwable::printStackTrace).apply(bytes).get();
+    }
+}

did-core/src/main/java/io/github/ehlxr/did/serializer/impl/JdkSerializer.java

@@ -22,9 +22,10 @@
  * THE SOFTWARE.
  */
 
-package io.github.ehlxr.did.serializer;
+package io.github.ehlxr.did.serializer.impl;
 
 import io.github.ehlxr.did.common.Try;
+import io.github.ehlxr.did.serializer.Serializer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

did-core/src/main/java/io/github/ehlxr/did/serializer/impl/ProtostuffSerializer.java

@@ -22,9 +22,10 @@
  * THE SOFTWARE.
  */
 
-package io.github.ehlxr.did.serializer;
+package io.github.ehlxr.did.serializer.impl;
 
 import io.github.ehlxr.did.common.Try;
+import io.github.ehlxr.did.serializer.Serializer;
 import io.protostuff.LinkedBuffer;
 import io.protostuff.ProtostuffIOUtil;
 import io.protostuff.Schema;
@@ -57,9 +58,7 @@ public class ProtostuffSerializer implements Serializer {
             return ProtostuffIOUtil.toByteArray(obj, schema, buffer);
         }).apply(buffer).trap(e -> {
             throw new IllegalStateException(e.getMessage(), e);
-        }).andFinally(b -> {
-            ((LinkedBuffer) b).clear();
-        }).get();
+        }).andFinally(b -> ((LinkedBuffer) b).clear()).get();
     }
 
     @Override

did-core/src/main/resources/META-INF/extensions/internal/io.github.ehlxr.did.serializer.Serializer

@@ -1,3 +1,4 @@
-#protostuff1=io.github.ehlxr.did.serializer.ProtostuffSerializer
-protostuff=io.github.ehlxr.did.serializer.ProtostuffSerializer
-io.github.ehlxr.did.serializer.JdkSerializer
+#protostuff1=io.github.ehlxr.did.serializer.impl.ProtostuffSerializer
+protostuff=io.github.ehlxr.did.serializer.impl.ProtostuffSerializer
+io.github.ehlxr.did.serializer.impl.JdkSerializer
+io.github.ehlxr.did.serializer.impl.HessianSerializer

did-core/src/test/java/io/github/ehlxr/did/SerializerTest.java

@@ -0,0 +1,92 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright © 2020 xrv <xrg@live.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package io.github.ehlxr.did;
+
+import io.github.ehlxr.did.extension.ExtensionLoader;
+import io.github.ehlxr.did.serializer.Serializer;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author ehlxr
+ * @since 2021-02-13 11:59.
+ */
+public class SerializerTest {
+    private static final Logger logger = LoggerFactory.getLogger(SerializerTest.class);
+    private SdkProto message;
+
+    @Before
+    public void init() {
+        message = SdkProto.newBuilder().did(238231232112121L).build();
+        message.rqid();
+    }
+
+    @Test
+    public void jdkTest() {
+        Serializer serializer = ExtensionLoader.getExtensionLoader(Serializer.class).getExtension("jdk");
+
+        long b1 = System.currentTimeMillis();
+        byte[] bytes = serializer.serializer(message);
+        long e1 = System.currentTimeMillis();
+        logger.info("jdk serialize result length = {}, cost time：{}", bytes.length, (e1 - b1));
+
+        long b2 = System.currentTimeMillis();
+        SdkProto data = serializer.deserializer(bytes, SdkProto.class);
+        long e2 = System.currentTimeMillis();
+        logger.info("jdk deserialize result：{}, cost time：{}", data, (e2 - b2));
+    }
+
+    @Test
+    public void hessianTest() {
+        Serializer serializer = ExtensionLoader.getExtensionLoader(Serializer.class).getExtension("hessian");
+
+        long b1 = System.currentTimeMillis();
+        byte[] bytes = serializer.serializer(message);
+        long e1 = System.currentTimeMillis();
+        logger.info("hessian serialize result length = {}, cost time：{}", bytes.length, (e1 - b1));
+
+        long b2 = System.currentTimeMillis();
+        SdkProto data = serializer.deserializer(bytes, SdkProto.class);
+        long e2 = System.currentTimeMillis();
+        logger.info("hessian deserialize result：{}, cost time：{}", data, (e2 - b2));
+    }
+
+    @Test
+    public void protostuffTest() {
+        Serializer serializer = ExtensionLoader.getExtensionLoader(Serializer.class).getExtension("protostuff");
+
+        long b1 = System.currentTimeMillis();
+        byte[] bytes = serializer.serializer(message);
+        long e1 = System.currentTimeMillis();
+        logger.info("protostuff serialize result length = {}, cost time：{}", bytes.length, (e1 - b1));
+
+        long b2 = System.currentTimeMillis();
+        SdkProto data = serializer.deserializer(bytes, SdkProto.class);
+        long e2 = System.currentTimeMillis();
+        logger.info("protostuff deserialize result：{}, cost time：{}", data, (e2 - b2));
+    }
+}