> {
+ /**
+ * 支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ * ByteBufAllocator.DEFAULT,
+ * new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ * responseSubPackage -> {
+ * },
+ * Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ * Jt808MsgEncryptionHandler.NO_OPS
+ * );
+ * final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ * try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator, encoder, originalBuf)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ *
+ * final ByteBuf result2 = builder.build();
+ * Assertions.assertEquals(1, result2.refCnt());
+ *
+ * doSomeProcess(result2);
+ *
+ * result2.release();
+ * Assertions.assertEquals(0, result2.refCnt());
+ * }
+ * // try-with-resources 会自动释放 originalBuf
+ * Assertions.assertEquals(0, originalBuf.refCnt());
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf body} 临时变量。
+ * @see #release()
+ * @see RebuildableByteBufJt808MsgBuilder#close()
+ * @since 2.1.4
+ */
+ static RebuildableByteBufJt808MsgBuilder newRebuildableByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder, ByteBuf body) {
+ return new RebuildableByteBufJt808MsgBuilder(flowIdGenerator, encoder, body);
+ }
+
+ /**
+ * 支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ * ByteBufAllocator.DEFAULT,
+ * new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ * responseSubPackage -> {
+ * },
+ * Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ * Jt808MsgEncryptionHandler.NO_OPS
+ * );
+ * try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator, encoder)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ *
+ * final ByteBuf result2 = builder.build();
+ * Assertions.assertEquals(1, result2.refCnt());
+ *
+ * doSomeProcess(result2);
+ *
+ * result2.release();
+ * Assertions.assertEquals(0, result2.refCnt());
+ * }
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf} 临时变量。
+ * @see #release()
+ * @see RebuildableByteBufJt808MsgBuilder#close()
+ * @since 2.1.4
+ */
+ static RebuildableByteBufJt808MsgBuilder newRebuildableByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder) {
+ return new RebuildableByteBufJt808MsgBuilder(flowIdGenerator, encoder);
+ }
+
+ /**
+ * 支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ * try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator, originalBuf)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ *
+ * final ByteBuf result2 = builder.build();
+ * Assertions.assertEquals(1, result2.refCnt());
+ *
+ * doSomeProcess(result2);
+ *
+ * result2.release();
+ * Assertions.assertEquals(0, result2.refCnt());
+ * }
+ * // try-with-resources 会自动释放 originalBuf
+ * Assertions.assertEquals(0, originalBuf.refCnt());
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf body} 临时变量。
+ * @see #release()
+ * @see RebuildableByteBufJt808MsgBuilder#close()
+ * @since 2.1.4
+ */
+ static RebuildableByteBufJt808MsgBuilder newRebuildableByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBuf body) {
+ return new RebuildableByteBufJt808MsgBuilder(flowIdGenerator, body);
+ }
+
+ /**
+ * 支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ *
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ * doSomeProcess(result);
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ *
+ * final ByteBuf result2 = builder.build();
+ * Assertions.assertEquals(1, result2.refCnt());
+ * doSomeProcess(result2);
+ * result2.release();
+ * Assertions.assertEquals(0, result2.refCnt());
+ * }
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf} 临时变量。
+ * @see #release()
+ * @see RebuildableByteBufJt808MsgBuilder#close()
+ * @since 2.1.4
+ */
+ static RebuildableByteBufJt808MsgBuilder newRebuildableByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator) {
+ return new RebuildableByteBufJt808MsgBuilder(flowIdGenerator);
+ }
+
+ /**
+ * 不支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * final ByteBuf originalBuf = ...;
+ * try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, originalBuf)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ * }
+ * // try-with-resources 会自动释放 originalBuf
+ * Assertions.assertEquals(0, originalBuf.refCnt());
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf body} 临时变量。
+ * @see #release()
+ * @see ByteBufJt808MsgBuilder#close()
+ */
static ByteBufJt808MsgBuilder newByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBuf body) {
return new ByteBufJt808MsgBuilder(flowIdGenerator, body);
}
+ /**
+ * 不支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ * }
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf} 临时变量。
+ * @see #release()
+ * @see ByteBufJt808MsgBuilder#close()
+ * @since 2.1.4
+ */
+ static ByteBufJt808MsgBuilder newByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator) {
+ return new ByteBufJt808MsgBuilder(flowIdGenerator);
+ }
+
+ /**
+ * 不支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ * ByteBufAllocator.DEFAULT,
+ * new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ * responseSubPackage -> {
+ * },
+ * Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ * Jt808MsgEncryptionHandler.NO_OPS
+ * );
+ * final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ * try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, encoder, originalBuf)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ * }
+ * // try-with-resources 会自动释放 originalBuf
+ * Assertions.assertEquals(0, originalBuf.refCnt());
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf body} 临时变量。
+ */
static ByteBufJt808MsgBuilder newByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder, ByteBuf body) {
return new ByteBufJt808MsgBuilder(flowIdGenerator, encoder, body);
}
+ /**
+ * 不支持 重复调用 {@link #build()} 方法
+ *
+ * 推荐在 {@code try-with-resources} 块中使用：
+ *
{@code
+ * final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ * ByteBufAllocator.DEFAULT,
+ * new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ * responseSubPackage -> {
+ * },
+ * Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ * Jt808MsgEncryptionHandler.NO_OPS
+ * );
+ * try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, encoder)) {
+ * builder.version(...)
+ * .msgId(...)
+ * .terminalId(...)
+ * .body(writer -> writer.writeDWord(1)
+ * .writeWord(2)
+ * .writeString("abc")
+ * );
+ * final ByteBuf result = builder.build();
+ * Assertions.assertEquals(1, result.refCnt());
+ *
+ * doSomeProcess(result);
+ *
+ * result.release();
+ * Assertions.assertEquals(0, result.refCnt());
+ * }
+ * }
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 需要手动调用 {@link #release()} 方法以释放内部用到的 {@code ByteBuf} 临时变量。
+ * @since 2.1.4
+ */
+ static ByteBufJt808MsgBuilder newByteBufBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder) {
+ return new ByteBufJt808MsgBuilder(flowIdGenerator, encoder);
+ }
+
+ /**
+ * 支持 重复调用 {@link #build()} 方法
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 无需调用 {@link #release()} 方法。
+ */
static EntityJt808MsgBuilder newEntityBuilder(Jt808FlowIdGenerator flowIdGenerator) {
return new EntityJt808MsgBuilder(flowIdGenerator);
}
+ /**
+ * 支持 重复调用 {@link #build()} 方法
+ *
+ * @return 方法返回的构建结果需要调用方自己 在恰当的时机释放。
+ * @apiNote 这个实现类 无需调用 {@link #release()} 方法。
+ */
static EntityJt808MsgBuilder newEntityBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder) {
return new EntityJt808MsgBuilder(flowIdGenerator, encoder);
}
@@ -76,6 +412,8 @@ default String toHexString() {
JtProtocolUtils.release(byteBuf);
}
throw e;
+ } finally {
+ JtProtocolUtils.release(byteBuf);
}
}
}
diff --git a/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/Jt808MsgEncryptionHandler.java b/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/Jt808MsgEncryptionHandler.java
index a02abe32..c426b8e0 100644
--- a/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/Jt808MsgEncryptionHandler.java
+++ b/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/Jt808MsgEncryptionHandler.java
@@ -1,5 +1,6 @@
package io.github.hylexus.jt.jt808.spec;
+import io.github.hylexus.jt.annotation.BuiltinComponent;
import io.github.hylexus.jt.jt808.support.annotation.msg.resp.Jt808ResponseBody;
import io.netty.buffer.ByteBuf;
@@ -34,6 +35,7 @@ public interface Jt808MsgEncryptionHandler {
Jt808MsgEncryptionHandler NO_OPS = new NoOps();
+ @BuiltinComponent
class NoOps implements Jt808MsgEncryptionHandler {
@Override
diff --git a/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilder.java b/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilder.java
index 4f15fa17..bfdf3e6e 100644
--- a/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilder.java
+++ b/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilder.java
@@ -20,13 +20,23 @@
* @author hylexus
*/
@UnstableApi
-public class ByteBufJt808MsgBuilder extends AbstractJt808MsgBuilder {
+public class ByteBufJt808MsgBuilder extends AbstractJt808MsgBuilder implements AutoCloseable {
+
+ private boolean alreadyBuilt = false;
+
+ public ByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder) {
+ this(flowIdGenerator, encoder, ByteBufAllocator.DEFAULT.buffer());
+ }
public ByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder, ByteBuf byteBuf) {
super(flowIdGenerator, encoder);
this.body = byteBuf;
}
+ public ByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator) {
+ this(flowIdGenerator, ByteBufAllocator.DEFAULT.buffer());
+ }
+
public ByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBuf byteBuf) {
super(flowIdGenerator);
this.body = byteBuf;
@@ -44,6 +54,7 @@ public ByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBufAlloc
@Override
protected Jt808Response toJt808Response() {
+ this.alreadyBuilt = true;
return new DefaultJt808Response(
requireNonNull(version, "version() can not be null"),
assertThat(msgId, id -> id != null && id > 0, "msgId() can not be null"),
@@ -57,9 +68,9 @@ protected Jt808Response toJt808Response() {
}
public ByteBufJt808MsgBuilder body(Consumer consumer) {
- final Jt808ByteWriter writer = Jt808ByteWriter.of(body());
+ final Jt808ByteWriter writer = Jt808ByteWriter.of(this.body);
consumer.accept(writer);
- return super.body(body);
+ return this;
}
@Override
@@ -74,6 +85,10 @@ public ByteBufJt808MsgBuilder body(ByteBuf body) {
@Override
public ByteBuf build() {
+ if (this.alreadyBuilt) {
+ throw new IllegalStateException("ByteBufJt808MsgBuilder can not be built more than once.");
+ }
+
Jt808Response jt808Response = null;
try {
jt808Response = this.toJt808Response();
@@ -92,4 +107,9 @@ public ByteBufJt808MsgBuilder release() {
JtProtocolUtils.release(this.body);
return this;
}
+
+ @Override
+ public void close() {
+ this.release();
+ }
}
diff --git a/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/RebuildableByteBufJt808MsgBuilder.java b/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/RebuildableByteBufJt808MsgBuilder.java
new file mode 100644
index 00000000..3b855dc1
--- /dev/null
+++ b/jt-808-server-support/src/main/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/RebuildableByteBufJt808MsgBuilder.java
@@ -0,0 +1,104 @@
+package io.github.hylexus.jt.jt808.spec.impl.msg.builder;
+
+import io.github.hylexus.jt.jt808.spec.Jt808Response;
+import io.github.hylexus.jt.jt808.spec.impl.response.DefaultJt808Response;
+import io.github.hylexus.jt.jt808.spec.session.Jt808FlowIdGenerator;
+import io.github.hylexus.jt.jt808.support.codec.Jt808ByteWriter;
+import io.github.hylexus.jt.jt808.support.codec.Jt808MsgBytesProcessor;
+import io.github.hylexus.jt.jt808.support.codec.Jt808MsgEncoder;
+import io.github.hylexus.jt.jt808.support.utils.JtProtocolUtils;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
+import java.util.function.Consumer;
+
+import static io.github.hylexus.jt.utils.Assertions.assertThat;
+import static io.github.hylexus.jt.utils.Assertions.requireNonNull;
+
+public class RebuildableByteBufJt808MsgBuilder extends AbstractJt808MsgBuilder implements AutoCloseable {
+
+
+ public RebuildableByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder) {
+ this(flowIdGenerator, encoder, ByteBufAllocator.DEFAULT.buffer());
+ }
+
+ public RebuildableByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, Jt808MsgEncoder encoder, ByteBuf byteBuf) {
+ super(flowIdGenerator, encoder);
+ this.body = byteBuf;
+ }
+
+ public RebuildableByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator) {
+ this(flowIdGenerator, ByteBufAllocator.DEFAULT.buffer());
+ }
+
+ public RebuildableByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBuf byteBuf) {
+ super(flowIdGenerator);
+ this.body = byteBuf;
+ }
+
+ public RebuildableByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBufAllocator allocator, ByteBuf byteBuf) {
+ super(flowIdGenerator, allocator);
+ this.body = byteBuf;
+ }
+
+ public RebuildableByteBufJt808MsgBuilder(Jt808FlowIdGenerator flowIdGenerator, ByteBufAllocator allocator, Jt808MsgBytesProcessor msgBytesProcessor, ByteBuf byteBuf) {
+ super(flowIdGenerator, allocator, msgBytesProcessor);
+ this.body = byteBuf;
+ }
+
+ @Override
+ protected Jt808Response toJt808Response() {
+ return new DefaultJt808Response(
+ requireNonNull(version, "version() can not be null"),
+ assertThat(msgId, id -> id != null && id > 0, "msgId() can not be null"),
+ encryptionType,
+ maxPackageSize == null ? Jt808Response.DEFAULT_MAX_PACKAGE_SIZE : maxPackageSize,
+ reversedBit15InHeader == null ? 0 : reversedBit15InHeader,
+ requireNonNull(terminalId, "terminalId() can not be null"),
+ -1,
+ requireNonNull(body, "body() can not be null").copy()
+ );
+ }
+
+ public RebuildableByteBufJt808MsgBuilder body(Consumer consumer) {
+ final Jt808ByteWriter writer = Jt808ByteWriter.of(this.body);
+ consumer.accept(writer);
+ return this;
+ }
+
+ @Override
+ public RebuildableByteBufJt808MsgBuilder body(ByteBuf body) {
+ final ByteBuf old = this.body();
+ try {
+ return super.body(body);
+ } finally {
+ JtProtocolUtils.release(old);
+ }
+ }
+
+ @Override
+ public ByteBuf build() {
+ Jt808Response jt808Response = null;
+ try {
+ jt808Response = this.toJt808Response();
+ return this.encoder.encode(jt808Response, this.flowIdGenerator);
+ } catch (Exception e) {
+ if (jt808Response != null) {
+ jt808Response.release();
+ }
+ this.release();
+ throw e;
+ }
+ }
+
+ @Override
+ public RebuildableByteBufJt808MsgBuilder release() {
+ JtProtocolUtils.release(this.body);
+ return this;
+ }
+
+ @Override
+ public void close() {
+ this.release();
+ }
+}
diff --git a/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderTest.java b/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderTest.java
index 336b4903..c70dc51d 100644
--- a/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderTest.java
+++ b/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderTest.java
@@ -9,7 +9,7 @@
import io.github.hylexus.jt.jt808.support.annotation.msg.resp.ResponseField;
import io.github.hylexus.jt.utils.HexStringUtils;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
import lombok.Data;
import lombok.experimental.Accessors;
import org.junit.jupiter.api.Test;
@@ -73,32 +73,35 @@ void testEntityMsgBuilder() {
@Test
public void testByteBufMsgBuilder() {
- final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer(128);
- final ByteBufJt808MsgBuilder builder = Jt808MsgBuilder.newByteBufBuilder(ALWAYS_RETURN_0, originalBuf)
- .version(Jt808ProtocolVersion.VERSION_2013)
- .msgId(BuiltinJt808MsgType.CLIENT_COMMON_REPLY)
- .terminalId("013912344323")
- // 消息体借助 Jt808ByteWriter 来写入内容
- // 也可以直接提供一个已经写好内容的 ByteBuf 用来充当消息体
- .body(writer -> writer
- // 1. 应答流水号 WORD 对应的平台消息的流水号
- .writeWord(0)
- // 2. 应答id WORD 对应的平台消息的 ID
- .writeWord(0x8103)
- // 3. 结果 byte 0:成功/确认;1:失败;2:消息有误;3:不支持
- .writeByte(0)
- );
-
- final ByteBuf result = builder.build();
- assertEquals("7E0001000501391234432300000000810300F87E", HexStringUtils.byteBufToString(result));
- assertEquals("7E0001000501391234432300000000810300F87E", builder.toHexString());
-
- assertEquals(1, originalBuf.refCnt());
- assertEquals(result.refCnt(), originalBuf.refCnt());
-
- result.release();
-
+ // final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer(128);
+ final ByteBuf originalBuf = Unpooled.buffer(128);
+ try (ByteBufJt808MsgBuilder builder = Jt808MsgBuilder.newByteBufBuilder(ALWAYS_RETURN_0, originalBuf)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2013)
+ .msgId(BuiltinJt808MsgType.CLIENT_COMMON_REPLY)
+ .terminalId("013912344323")
+ // 消息体借助 Jt808ByteWriter 来写入内容
+ // 也可以直接提供一个已经写好内容的 ByteBuf 用来充当消息体
+ .body(writer -> writer
+ // 1. 应答流水号 WORD 对应的平台消息的流水号
+ .writeWord(0)
+ // 2. 应答id WORD 对应的平台消息的 ID
+ .writeWord(0x8103)
+ // 3. 结果 byte 0:成功/确认;1:失败;2:消息有误;3:不支持
+ .writeByte(0)
+ );
+
+ final ByteBuf result = builder.build();
+ assertEquals("7E0001000501391234432300000000810300F87E", HexStringUtils.byteBufToString(result));
+
+ assertEquals(1, result.refCnt());
+ assertEquals(1, originalBuf.refCnt());
+
+ // 在恰当的时机释放构建结果
+ result.release();
+ assertEquals(0, result.refCnt());
+ }
+
+ // try-with-resource 释放了 originalBuf
assertEquals(0, originalBuf.refCnt());
- assertEquals(result.refCnt(), originalBuf.refCnt());
}
-}
\ No newline at end of file
+}
diff --git a/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilderTest.java b/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilderTest.java
new file mode 100644
index 00000000..3de21574
--- /dev/null
+++ b/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/ByteBufJt808MsgBuilderTest.java
@@ -0,0 +1,124 @@
+package io.github.hylexus.jt.jt808.spec.impl.msg.builder;
+
+import io.github.hylexus.jt.jt808.Jt808ProtocolVersion;
+import io.github.hylexus.jt.jt808.spec.Jt808MsgBuilder;
+import io.github.hylexus.jt.jt808.spec.Jt808MsgEncryptionHandler;
+import io.github.hylexus.jt.jt808.spec.session.Jt808FlowIdGenerator;
+import io.github.hylexus.jt.jt808.support.codec.Jt808MsgEncoder;
+import io.github.hylexus.jt.jt808.support.codec.Jt808ResponseSubPackageStorage;
+import io.github.hylexus.jt.jt808.support.codec.impl.DefaultJt808MsgBytesProcessor;
+import io.github.hylexus.jt.jt808.support.codec.impl.DefaultJt808MsgEncoder;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class ByteBufJt808MsgBuilderTest {
+
+ Jt808FlowIdGenerator flowIdGenerator = step -> 0;
+
+ @Test
+ void test1() {
+ try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+ }
+ }
+
+ @Test
+ void test2() {
+ final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, originalBuf)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+ }
+ // try-with-resources 会自动释放 originalBuf
+ Assertions.assertEquals(0, originalBuf.refCnt());
+ }
+
+ @Test
+ void test3() {
+ final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ ByteBufAllocator.DEFAULT,
+ new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ responseSubPackage -> {
+ },
+ Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ Jt808MsgEncryptionHandler.NO_OPS
+ );
+ final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, encoder, originalBuf)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+ }
+ // try-with-resources 会自动释放 originalBuf
+ Assertions.assertEquals(0, originalBuf.refCnt());
+ }
+
+ @Test
+ void test4() {
+ final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ ByteBufAllocator.DEFAULT,
+ new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ responseSubPackage -> {
+ },
+ Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ Jt808MsgEncryptionHandler.NO_OPS
+ );
+ try (var builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, encoder)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+ }
+ }
+
+ private void doSomeProcess(ByteBuf ignore) {
+ }
+}
diff --git a/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/RebuildableByteBufJt808MsgBuilderTest.java b/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/RebuildableByteBufJt808MsgBuilderTest.java
new file mode 100644
index 00000000..258d8959
--- /dev/null
+++ b/jt-808-server-support/src/test/java/io/github/hylexus/jt/jt808/spec/impl/msg/builder/RebuildableByteBufJt808MsgBuilderTest.java
@@ -0,0 +1,165 @@
+package io.github.hylexus.jt.jt808.spec.impl.msg.builder;
+
+import io.github.hylexus.jt.jt808.Jt808ProtocolVersion;
+import io.github.hylexus.jt.jt808.spec.Jt808MsgBuilder;
+import io.github.hylexus.jt.jt808.spec.Jt808MsgEncryptionHandler;
+import io.github.hylexus.jt.jt808.spec.impl.BuiltinJt808MsgType;
+import io.github.hylexus.jt.jt808.spec.session.Jt808FlowIdGenerator;
+import io.github.hylexus.jt.jt808.support.codec.Jt808MsgEncoder;
+import io.github.hylexus.jt.jt808.support.codec.Jt808ResponseSubPackageStorage;
+import io.github.hylexus.jt.jt808.support.codec.impl.DefaultJt808MsgBytesProcessor;
+import io.github.hylexus.jt.jt808.support.codec.impl.DefaultJt808MsgEncoder;
+import io.github.hylexus.jt.utils.FormatUtils;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class RebuildableByteBufJt808MsgBuilderTest {
+ Jt808FlowIdGenerator flowIdGenerator = step -> 0;
+
+
+ @Test
+ void test1() {
+ try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+
+ final ByteBuf result2 = builder.build();
+ Assertions.assertEquals(1, result2.refCnt());
+
+ doSomeProcess(result2);
+
+ result2.release();
+ Assertions.assertEquals(0, result2.refCnt());
+ }
+ }
+
+ @Test
+ void test2() {
+ final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator, originalBuf)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2013)
+ .msgId(BuiltinJt808MsgType.CLIENT_COMMON_REPLY)
+ .terminalId("013912344323")
+ // 消息体借助 Jt808ByteWriter 来写入内容
+ // 也可以直接提供一个已经写好内容的 ByteBuf 用来充当消息体
+ .body(writer -> writer
+ // 1. 应答流水号 WORD 对应的平台消息的流水号
+ .writeWord(0)
+ // 2. 应答id WORD 对应的平台消息的 ID
+ .writeWord(0x8103)
+ // 3. 结果 byte 0:成功/确认;1:失败;2:消息有误;3:不支持
+ .writeByte(0)
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+ Assertions.assertEquals("7E0001000501391234432300000000810300F87E", FormatUtils.toHexString(result));
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+
+ final ByteBuf result2 = builder.build();
+ Assertions.assertEquals(1, result2.refCnt());
+
+ doSomeProcess(result2);
+
+ result2.release();
+ Assertions.assertEquals(0, result2.refCnt());
+ }
+ // try-with-resources 会自动释放 originalBuf
+ Assertions.assertEquals(0, originalBuf.refCnt());
+ }
+
+ @Test
+ void test3() {
+ final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ ByteBufAllocator.DEFAULT,
+ new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ responseSubPackage -> {
+ },
+ Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ Jt808MsgEncryptionHandler.NO_OPS
+ );
+ final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer();
+ try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator, encoder, originalBuf)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+
+ final ByteBuf result2 = builder.build();
+ Assertions.assertEquals(1, result2.refCnt());
+
+ doSomeProcess(result2);
+
+ result2.release();
+ Assertions.assertEquals(0, result2.refCnt());
+ }
+ // try-with-resources 会自动释放 originalBuf
+ Assertions.assertEquals(0, originalBuf.refCnt());
+ }
+
+ @Test
+ void test4() {
+ final Jt808MsgEncoder encoder = new DefaultJt808MsgEncoder(
+ ByteBufAllocator.DEFAULT,
+ new DefaultJt808MsgBytesProcessor(ByteBufAllocator.DEFAULT),
+ responseSubPackage -> {
+ },
+ Jt808ResponseSubPackageStorage.NO_OPS_STORAGE,
+ Jt808MsgEncryptionHandler.NO_OPS
+ );
+ try (var builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(flowIdGenerator, encoder)) {
+ builder.version(Jt808ProtocolVersion.VERSION_2019)
+ .msgId(0x1111)
+ .terminalId("013912344323")
+ .body(writer -> writer.writeDWord(1)
+ .writeWord(2)
+ .writeString("abc")
+ );
+ final ByteBuf result = builder.build();
+ Assertions.assertEquals(1, result.refCnt());
+
+ doSomeProcess(result);
+
+ result.release();
+ Assertions.assertEquals(0, result.refCnt());
+
+ final ByteBuf result2 = builder.build();
+ Assertions.assertEquals(1, result2.refCnt());
+
+ doSomeProcess(result2);
+
+ result2.release();
+ Assertions.assertEquals(0, result2.refCnt());
+ }
+ }
+
+ private void doSomeProcess(ByteBuf ignore) {
+ }
+}
diff --git a/jt-core/jt-core.gradle b/jt-core/jt-core.gradle
index cbefdb8d..1d23c240 100644
--- a/jt-core/jt-core.gradle
+++ b/jt-core/jt-core.gradle
@@ -26,4 +26,6 @@ test {
exclude '**/CommandWaitingPoolTest.class'
useJUnitPlatform()
+ // https://github.com/gradle/gradle/issues/7773
+ systemProperties(System.properties)
}
diff --git a/samples/jt-1078-server-sample-webflux-boot3/jt-1078-server-sample-webflux-boot3.gradle b/samples/jt-1078-server-sample-webflux-boot3/jt-1078-server-sample-webflux-boot3.gradle
index c3ee41c5..8c8a560c 100644
--- a/samples/jt-1078-server-sample-webflux-boot3/jt-1078-server-sample-webflux-boot3.gradle
+++ b/samples/jt-1078-server-sample-webflux-boot3/jt-1078-server-sample-webflux-boot3.gradle
@@ -26,4 +26,6 @@ test {
exclude '**/ClientTest.class'
useJUnitPlatform()
+ // https://github.com/gradle/gradle/issues/7773
+ systemProperties(System.properties)
}
diff --git a/samples/jt-1078-server-sample-webmvc-boot3/jt-1078-server-sample-webmvc-boot3.gradle b/samples/jt-1078-server-sample-webmvc-boot3/jt-1078-server-sample-webmvc-boot3.gradle
index b67c27d5..2cd9d3ec 100644
--- a/samples/jt-1078-server-sample-webmvc-boot3/jt-1078-server-sample-webmvc-boot3.gradle
+++ b/samples/jt-1078-server-sample-webmvc-boot3/jt-1078-server-sample-webmvc-boot3.gradle
@@ -26,4 +26,6 @@ dependencies {
test {
useJUnitPlatform()
+ // https://github.com/gradle/gradle/issues/7773
+ systemProperties(System.properties)
}
diff --git a/samples/jt-808-client-sample-debug/jt-808-client-sample-debug.gradle b/samples/jt-808-client-sample-debug/jt-808-client-sample-debug.gradle
index 468e852f..b3bce45e 100644
--- a/samples/jt-808-client-sample-debug/jt-808-client-sample-debug.gradle
+++ b/samples/jt-808-client-sample-debug/jt-808-client-sample-debug.gradle
@@ -23,4 +23,6 @@ dependencies {
test {
useJUnitPlatform()
+ // https://github.com/gradle/gradle/issues/7773
+ systemProperties(System.properties)
}
diff --git a/samples/jt-808-client-sample-debug/src/main/java/io/github/hylexus/jt808/samples/client/debug/client1/MessageGenerator.java b/samples/jt-808-client-sample-debug/src/main/java/io/github/hylexus/jt808/samples/client/debug/client1/MessageGenerator.java
index 3a093f1e..b695fb68 100644
--- a/samples/jt-808-client-sample-debug/src/main/java/io/github/hylexus/jt808/samples/client/debug/client1/MessageGenerator.java
+++ b/samples/jt-808-client-sample-debug/src/main/java/io/github/hylexus/jt808/samples/client/debug/client1/MessageGenerator.java
@@ -3,6 +3,7 @@
import io.github.hylexus.jt.jt808.Jt808ProtocolVersion;
import io.github.hylexus.jt.jt808.spec.Jt808MsgBuilder;
import io.github.hylexus.jt.jt808.spec.impl.BuiltinJt808MsgType;
+import io.github.hylexus.jt.jt808.spec.impl.msg.builder.ByteBufJt808MsgBuilder;
import io.github.hylexus.jt.jt808.spec.session.Jt808FlowIdGenerator;
import io.github.hylexus.jt808.samples.client.debug.client1.entity.ClientLocationUploadMsgV2019;
import io.github.hylexus.jt808.samples.client.debug.client1.entity.ClientRegisterMsgV2013;
@@ -77,25 +78,27 @@ public static String formatTerminalId(String input, Jt808ProtocolVersion version
}
public ByteBuf randomClientRegisterV2019(Jt808FlowIdGenerator flowIdGenerator, String terminalId) {
- return Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, ByteBufAllocator.DEFAULT.buffer(128))
- .version(VERSION_2019)
- .msgId(BuiltinJt808MsgType.CLIENT_REGISTER)
- .terminalId(terminalId)
- .body(writer -> writer
- // 省域ID WORD
- .writeWord(11)
- // 市县域ID WORD
- .writeWord(2)
- // 制造商ID byte[11]
- .writeString("id987654321")
- // 终端型号 byte[30]
- .writeString("type00123456781234567887654321")
- // 终端ID byte[30]
- .writeString("ID0000123456781234567887654321")
- .writeByte(1)
- .writeString("甘J-123459")
- )
- .build();
+ try (ByteBufJt808MsgBuilder builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, ByteBufAllocator.DEFAULT.buffer(128))) {
+ return builder
+ .version(VERSION_2019)
+ .msgId(BuiltinJt808MsgType.CLIENT_REGISTER)
+ .terminalId(terminalId)
+ .body(writer -> writer
+ // 省域ID WORD
+ .writeWord(11)
+ // 市县域ID WORD
+ .writeWord(2)
+ // 制造商ID byte[11]
+ .writeString("id987654321")
+ // 终端型号 byte[30]
+ .writeString("type00123456781234567887654321")
+ // 终端ID byte[30]
+ .writeString("ID0000123456781234567887654321")
+ .writeByte(1)
+ .writeString("甘J-123459")
+ )
+ .build();
+ }
}
public ByteBuf randomClientRegisterV2013(Jt808FlowIdGenerator flowIdGenerator, String terminalId) {
@@ -140,32 +143,34 @@ public ByteBuf randomLocationMsgV2013(Jt808FlowIdGenerator flowIdGenerator, Stri
public ByteBuf randomLocationMsgV2019(Jt808FlowIdGenerator flowIdGenerator, String terminalId, int maxPackageSize) {
final int mileage = mileages[new Random().nextInt(3)];
- return Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, ByteBufAllocator.DEFAULT.buffer(256))
- .version(VERSION_2019)
- .msgId(BuiltinJt808MsgType.CLIENT_LOCATION_INFO_UPLOAD)
- .terminalId(terminalId)
- .maxPackageSize(maxPackageSize)
- .body(writer -> writer
- .writeDWord(0)
- .writeDWord(0)
- .writeDWord(31235930 + ThreadLocalRandom.current().nextInt(100000))
- .writeDWord(121480540 + ThreadLocalRandom.current().nextInt(100000))
- // 16 height
- .writeWord(22)
- .writeWord(100)
- .writeWord(11)
- // 22 time
- .writeBcd("220322001214")
- // item1
- .writeByte(0x01)
- .writeByte(4)
- .writeDWord(ThreadLocalRandom.current().nextInt(mileage))
- //
- // item2
- .writeByte(0x02)
- .writeByte(2)
- .writeWord(99)
- )
- .build();
+ try (ByteBufJt808MsgBuilder builder = Jt808MsgBuilder.newByteBufBuilder(flowIdGenerator, ByteBufAllocator.DEFAULT.buffer(256))) {
+ return builder
+ .version(VERSION_2019)
+ .msgId(BuiltinJt808MsgType.CLIENT_LOCATION_INFO_UPLOAD)
+ .terminalId(terminalId)
+ .maxPackageSize(maxPackageSize)
+ .body(writer -> writer
+ .writeDWord(0)
+ .writeDWord(0)
+ .writeDWord(31235930 + ThreadLocalRandom.current().nextInt(100000))
+ .writeDWord(121480540 + ThreadLocalRandom.current().nextInt(100000))
+ // 16 height
+ .writeWord(22)
+ .writeWord(100)
+ .writeWord(11)
+ // 22 time
+ .writeBcd("220322001214")
+ // item1
+ .writeByte(0x01)
+ .writeByte(4)
+ .writeDWord(ThreadLocalRandom.current().nextInt(mileage))
+ //
+ // item2
+ .writeByte(0x02)
+ .writeByte(2)
+ .writeWord(99)
+ )
+ .build();
+ }
}
-}
\ No newline at end of file
+}
diff --git a/samples/jt-808-server-sample-annotation/jt-808-server-sample-annotation.gradle b/samples/jt-808-server-sample-annotation/jt-808-server-sample-annotation.gradle
index 2ef71d99..0dba3348 100644
--- a/samples/jt-808-server-sample-annotation/jt-808-server-sample-annotation.gradle
+++ b/samples/jt-808-server-sample-annotation/jt-808-server-sample-annotation.gradle
@@ -26,4 +26,6 @@ dependencies {
test {
useJUnitPlatform()
+ // https://github.com/gradle/gradle/issues/7773
+ systemProperties(System.properties)
}
diff --git a/samples/jt-808-server-sample-debug/jt-808-server-sample-debug.gradle b/samples/jt-808-server-sample-debug/jt-808-server-sample-debug.gradle
index c8436c8e..7318d71f 100644
--- a/samples/jt-808-server-sample-debug/jt-808-server-sample-debug.gradle
+++ b/samples/jt-808-server-sample-debug/jt-808-server-sample-debug.gradle
@@ -28,4 +28,6 @@ dependencies {
test {
useJUnitPlatform()
+ // https://github.com/gradle/gradle/issues/7773
+ systemProperties(System.properties)
}
diff --git a/samples/jt-808-server-sample-debug/src/main/java/io/github/hylexus/jt/jt808/samples/debug/Jt808ServerSampleDebugApplication.java b/samples/jt-808-server-sample-debug/src/main/java/io/github/hylexus/jt/jt808/samples/debug/Jt808ServerSampleDebugApplication.java
index b2cdf611..5867c5d3 100644
--- a/samples/jt-808-server-sample-debug/src/main/java/io/github/hylexus/jt/jt808/samples/debug/Jt808ServerSampleDebugApplication.java
+++ b/samples/jt-808-server-sample-debug/src/main/java/io/github/hylexus/jt/jt808/samples/debug/Jt808ServerSampleDebugApplication.java
@@ -11,6 +11,8 @@
public class Jt808ServerSampleDebugApplication {
public static void main(String[] args) {
+ // System.setProperty("io.netty.allocator.type", "unpooled");
+ // System.setProperty("io.netty.allocator.type","pooled");
// FIXME 如果你不了解 ResourceLeakDetector 是做什么的,请务必注释掉下面这行代码!!!
ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.PARANOID);
SpringApplication.run(Jt808ServerSampleDebugApplication.class, args);
diff --git a/samples/jt-808-server-sample-debug/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderEncryptTest.java b/samples/jt-808-server-sample-debug/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderEncryptTest.java
index 26e6b61f..b0b268c9 100644
--- a/samples/jt-808-server-sample-debug/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderEncryptTest.java
+++ b/samples/jt-808-server-sample-debug/src/test/java/io/github/hylexus/jt/jt808/spec/Jt808MsgBuilderEncryptTest.java
@@ -4,6 +4,7 @@
import io.github.hylexus.jt.jt808.samples.debug.handler.Jt808MsgEncryptionHandlerDemo01;
import io.github.hylexus.jt.jt808.spec.impl.BuiltinJt808MsgType;
import io.github.hylexus.jt.jt808.spec.impl.msg.builder.EntityJt808MsgBuilder;
+import io.github.hylexus.jt.jt808.spec.impl.msg.builder.RebuildableByteBufJt808MsgBuilder;
import io.github.hylexus.jt.jt808.spec.session.Jt808FlowIdGenerator;
import io.github.hylexus.jt.jt808.support.annotation.msg.resp.Jt808ResponseBody;
import io.github.hylexus.jt.jt808.support.annotation.msg.resp.ResponseFieldAlias;
@@ -13,8 +14,10 @@
import io.github.hylexus.jt.utils.HexStringUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
import lombok.Data;
import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,6 +25,7 @@
/**
* @author hylexus
*/
+@Slf4j
public class Jt808MsgBuilderEncryptTest {
// 这里使用-1，通过 Jt808MsgBuilder.msgId(int msgId) 来指定了消息ID
@@ -105,35 +109,43 @@ void testEntityMsgBuilder() {
assertEquals(0, result.refCnt());
}
- // @Test
- // public void testByteBufMsgBuilder() {
- // final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer(128);
- // final ByteBufJt808MsgBuilder builder = Jt808MsgBuilder.newByteBufBuilder(ALWAYS_RETURN_1, encoder, originalBuf)
- // .version(Jt808ProtocolVersion.VERSION_2013)
- // .msgId(BuiltinJt808MsgType.CLIENT_COMMON_REPLY)
- // .terminalId("013912344323")
- // .encryptionType(0b010)
- // // 消息体借助 Jt808ByteWriter 来写入内容
- // // 也可以直接提供一个已经写好内容的 ByteBuf 用来充当消息体
- // .body(writer -> writer
- // // 1. 应答流水号 WORD 对应的平台消息的流水号
- // .writeWord(0)
- // // 2. 应答id WORD 对应的平台消息的 ID
- // .writeWord(0x8103)
- // // 3. 结果 byte 0:成功/确认;1:失败;2:消息有误;3:不支持
- // .writeByte(0)
- // );
- //
- // final ByteBuf result = builder.build();
- // assertEquals("7E000108100139123443230001B35513C19F57CC81A1CA86622E4E506C047E", HexStringUtils.byteBufToString(result));
- // assertEquals("7E000108100139123443230001B35513C19F57CC81A1CA86622E4E506C047E", builder.toHexString());
- //
- // assertEquals(1, originalBuf.refCnt());
- // assertEquals(result.refCnt(), originalBuf.refCnt());
- //
- // result.release();
- //
- // assertEquals(0, originalBuf.refCnt());
- // assertEquals(result.refCnt(), originalBuf.refCnt());
- // }
+ @Test
+ public void testByteBufMsgBuilder() {
+ // `./gradlew clean build -Dio.netty.allocator.type=pooled`
+ // `./gradlew clean build -Dio.netty.allocator.type=unpooled`
+ // final ByteBuf originalBuf = ByteBufAllocator.DEFAULT.buffer(128);
+ final ByteBuf originalBuf = Unpooled.buffer(128);
+
+ try (RebuildableByteBufJt808MsgBuilder builder = Jt808MsgBuilder.newRebuildableByteBufBuilder(ALWAYS_RETURN_1, encoder, originalBuf)) {
+
+ builder.version(Jt808ProtocolVersion.VERSION_2013)
+ .msgId(BuiltinJt808MsgType.CLIENT_COMMON_REPLY)
+ .terminalId("013912344323")
+ .encryptionType(0b010)
+ // 消息体借助 Jt808ByteWriter 来写入内容
+ // 也可以直接提供一个已经写好内容的 ByteBuf 用来充当消息体
+ .body(writer -> writer
+ // 1. 应答流水号 WORD 对应的平台消息的流水号
+ .writeWord(0x1111)
+ // 2. 应答id WORD 对应的平台消息的 ID
+ .writeWord(0x8103)
+ // 3. 结果 byte 0:成功/确认;1:失败;2:消息有误;3:不支持
+ .writeByte(0x22)
+ );
+
+ final ByteBuf result = builder.build();
+ assertEquals("7E000108100139123443230001061EE8FEE8B9FA59FAF19642F93BC9E5AB7E", HexStringUtils.byteBufToString(result));
+ assertEquals("7E000108100139123443230001061EE8FEE8B9FA59FAF19642F93BC9E5AB7E", builder.toHexString());
+
+ assertEquals(1, originalBuf.refCnt());
+ assertEquals(1, result.refCnt());
+
+ // 在恰当的时机释放构建结果
+ result.release();
+ assertEquals(0, result.refCnt());
+ }
+
+ // try-with-resource 释放了 originalBuf
+ assertEquals(0, originalBuf.refCnt());
+ }
}