Merge remote-tracking branch 'origin/master'
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
ehlxr 2021-02-13 19:37:41 +08:00
commit 0df36ea686
37 changed files with 782 additions and 44 deletions

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>did-parent</artifactId> <artifactId>did-parent</artifactId>
<groupId>io.github.ehlxr</groupId> <groupId>io.github.ehlxr</groupId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -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.common; package io.github.ehlxr.did.common;
/** /**

View File

@ -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.common; package io.github.ehlxr.did.common;
import java.util.Map; import java.util.Map;

View File

@ -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.common; package io.github.ehlxr.did.common;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;

View File

@ -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.common; package io.github.ehlxr.did.common;
import io.netty.channel.Channel; import io.netty.channel.Channel;

View File

@ -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.common; package io.github.ehlxr.did.common;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;

View File

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

View File

@ -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; package io.github.ehlxr.did;
import io.github.ehlxr.did.common.JsonUtils; import io.github.ehlxr.did.common.JsonUtils;

View File

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

View File

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

View File

@ -25,6 +25,8 @@
package io.github.ehlxr.did.adapter; package io.github.ehlxr.did.adapter;
import io.github.ehlxr.did.SdkProto; 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.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToByteEncoder;
@ -40,11 +42,13 @@ public class MessageEncoder extends MessageToByteEncoder<Message<SdkProto>> {
@Override @Override
protected void encode(ChannelHandlerContext ctx, Message<SdkProto> msg, ByteBuf out) { protected void encode(ChannelHandlerContext ctx, Message<SdkProto> msg, ByteBuf out) {
Objects.requireNonNull(msg, "encode failed 'cause of recive message is null"); 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.getType());
out.writeByte(msg.getFlag()); out.writeByte(msg.getFlag());
out.writeInt(msg.getLength()); out.writeInt(bytes.length);
out.writeBytes(msg.getContent()); out.writeBytes(bytes);
} }
} }

View File

@ -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; package io.github.ehlxr.did.serializer;
import io.github.ehlxr.did.extension.SPI; import io.github.ehlxr.did.extension.SPI;

View File

@ -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; package io.github.ehlxr.did.serializer;
import io.github.ehlxr.did.common.Constants; import io.github.ehlxr.did.common.Constants;

View File

@ -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();
}
}

View File

@ -22,9 +22,10 @@
* THE SOFTWARE. * 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.common.Try;
import io.github.ehlxr.did.serializer.Serializer;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;

View File

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

View File

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

View File

@ -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));
}
}

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>did-parent</artifactId> <artifactId>did-parent</artifactId>
<groupId>io.github.ehlxr</groupId> <groupId>io.github.ehlxr</groupId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -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.client; package io.github.ehlxr.did.client;
import io.github.ehlxr.did.SdkProto; import io.github.ehlxr.did.SdkProto;

View File

@ -1,5 +1,28 @@
package io.github.ehlxr.did.client; /*
* 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.client;
import io.github.ehlxr.did.SdkProto; import io.github.ehlxr.did.SdkProto;
import io.github.ehlxr.did.common.Result; import io.github.ehlxr.did.common.Result;

View File

@ -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.client; package io.github.ehlxr.did.client;
/** /**

View File

@ -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.client; package io.github.ehlxr.did.client;
import io.github.ehlxr.did.SdkProto; import io.github.ehlxr.did.SdkProto;

View File

@ -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.client; package io.github.ehlxr.did.client;
import io.github.ehlxr.did.adapter.MessageDecoder; import io.github.ehlxr.did.adapter.MessageDecoder;

View File

@ -46,10 +46,7 @@ public class SdkClientHandler extends SimpleChannelInboundHandler<Message<SdkPro
protected void channelRead0(ChannelHandlerContext ctx, Message<SdkProto> message) { protected void channelRead0(ChannelHandlerContext ctx, Message<SdkProto> message) {
logger.debug("sdk client handler receive message {}", message); logger.debug("sdk client handler receive message {}", message);
SdkProto sdkProto = Try.<Message<SdkProto>, SdkProto>of(m -> m.content(SdkProto.class)) SdkProto sdkProto = message.getContent();
.apply(message)
.get();
final int rqid = sdkProto.getRqid(); final int rqid = sdkProto.getRqid();
final ResponseFuture responseFuture = Client.REPONSE_MAP.get(rqid); final ResponseFuture responseFuture = Client.REPONSE_MAP.get(rqid);
if (responseFuture != null) { if (responseFuture != null) {

View File

@ -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; package io.github.ehlxr.did;
import io.github.ehlxr.did.client.SdkClient; import io.github.ehlxr.did.client.SdkClient;

View File

@ -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; package io.github.ehlxr.did;
import io.github.ehlxr.did.client.SdkClient; import io.github.ehlxr.did.client.SdkClient;
@ -5,6 +29,8 @@ import io.github.ehlxr.did.common.Try;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -14,6 +40,8 @@ import java.util.stream.IntStream;
* @author ehlxr * @author ehlxr
*/ */
public class DidSdkTest { public class DidSdkTest {
private static final Logger logger = LoggerFactory.getLogger(DidSdkTest.class);
private static final int NUM = 10; private static final int NUM = 10;
SdkClient client; SdkClient client;
@ -34,26 +62,26 @@ public class DidSdkTest {
// 测试同步请求 // 测试同步请求
IntStream.range(0, NUM).parallel().forEach(i -> System.out.println(client.invokeSync())); IntStream.range(0, NUM).parallel().forEach(i -> System.out.println(client.invokeSync()));
System.out.println("invokeync test finish"); logger.info("invokeync test finish");
// 测试异步请求 // 测试异步请求
final CountDownLatch countDownLatch = new CountDownLatch(NUM); final CountDownLatch countDownLatch = new CountDownLatch(NUM);
IntStream.range(0, NUM).parallel().forEach(i -> IntStream.range(0, NUM).parallel().forEach(i ->
Try.of(() -> client.invokeAsync(responseFuture -> { Try.of(() -> client.invokeAsync(responseFuture -> {
System.out.println(responseFuture.getSdkProto()); logger.info("{}", responseFuture.getSdkProto());
countDownLatch.countDown(); countDownLatch.countDown();
})).trap(Throwable::printStackTrace).run()); })).trap(Throwable::printStackTrace).run());
//noinspection ResultOfMethodCallIgnored //noinspection ResultOfMethodCallIgnored
countDownLatch.await(10, TimeUnit.SECONDS); countDownLatch.await(10, TimeUnit.SECONDS);
System.out.println("invokeAsync test finish"); logger.info("invokeAsync test finish");
} }
@Test @Test
public void testInvoke() { public void testInvoke() {
// System.out.println(client.invoke()); // logger.info("{}", client.invoke());
client.setTimeoutMillis(3000); client.setTimeoutMillis(30000);
System.out.println(client.invoke()); logger.info("{}", client.invoke());
} }
} }

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>did-parent</artifactId> <artifactId>did-parent</artifactId>
<groupId>io.github.ehlxr</groupId> <groupId>io.github.ehlxr</groupId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -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; package io.github.ehlxr.did;
import io.github.ehlxr.did.common.Constants; import io.github.ehlxr.did.common.Constants;

View File

@ -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.generator; package io.github.ehlxr.did.generator;
/** /**

View File

@ -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.server; package io.github.ehlxr.did.server;
import io.github.ehlxr.did.generator.SnowFlake; import io.github.ehlxr.did.generator.SnowFlake;

View File

@ -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.server; package io.github.ehlxr.did.server;
/** /**

View File

@ -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.server.http; package io.github.ehlxr.did.server.http;
import io.github.ehlxr.did.generator.SnowFlake; import io.github.ehlxr.did.generator.SnowFlake;

View File

@ -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.server.http; package io.github.ehlxr.did.server.http;
import io.github.ehlxr.did.SdkProto; import io.github.ehlxr.did.SdkProto;

View File

@ -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.server.sdk; package io.github.ehlxr.did.server.sdk;
import io.github.ehlxr.did.generator.SnowFlake; import io.github.ehlxr.did.generator.SnowFlake;

View File

@ -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.server.sdk; package io.github.ehlxr.did.server.sdk;
import io.github.ehlxr.did.SdkProto; import io.github.ehlxr.did.SdkProto;
@ -37,7 +61,7 @@ public class SdkServerHandler extends SimpleChannelInboundHandler<Message<SdkPro
logger.debug("sdk server handler receive message {}", message); logger.debug("sdk server handler receive message {}", message);
if (semaphore.tryAcquire(Constants.ACQUIRE_TIMEOUTMILLIS, TimeUnit.MILLISECONDS)) { if (semaphore.tryAcquire(Constants.ACQUIRE_TIMEOUTMILLIS, TimeUnit.MILLISECONDS)) {
SdkProto sdkProto = message.content(SdkProto.class); SdkProto sdkProto = message.getContent();
sdkProto.setDid(snowFlake.nextId()); sdkProto.setDid(snowFlake.nextId());
message.setContent(sdkProto); message.setContent(sdkProto);

12
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>io.github.ehlxr</groupId> <groupId>io.github.ehlxr</groupId>
<artifactId>did-parent</artifactId> <artifactId>did-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
<modules> <modules>
<module>did-server</module> <module>did-server</module>
<module>did-sdk</module> <module>did-sdk</module>
@ -23,13 +23,14 @@
<!--目标编译的 Java 版本可以通过以下属性指定,不用配置 maven-compiler-plugin 插件--> <!--目标编译的 Java 版本可以通过以下属性指定,不用配置 maven-compiler-plugin 插件-->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<did.version>1.0.2-SNAPSHOT</did.version> <did.version>1.1.1-SNAPSHOT</did.version>
<netty.version>4.1.58.Final</netty.version> <netty.version>4.1.58.Final</netty.version>
<logback.version>1.1.7</logback.version> <logback.version>1.1.7</logback.version>
<junit.version>4.13.1</junit.version> <junit.version>4.13.1</junit.version>
<jackson.version>2.10.3</jackson.version> <jackson.version>2.10.3</jackson.version>
<protostuff.version>1.7.2</protostuff.version> <protostuff.version>1.7.2</protostuff.version>
<hessian.version>4.0.65</hessian.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -82,6 +83,13 @@
<artifactId>protostuff-runtime</artifactId> <artifactId>protostuff-runtime</artifactId>
<version>${protostuff.version}</version> <version>${protostuff.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
<version>${hessian.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>