Thirdparty
/
protostar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

使用@Repeatable优化多版本注解方式

master
剑器近 2020-12-23 18:20:03 +08:00
parent d14d42c90c
commit dd370d224f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/io/github/yezhihao/protostar/annotation/Field.java
View File

@ -2,15 +2,13 @@ package io.github.yezhihao.protostar.annotation;
import io.github.yezhihao.protostar.DataType; import io.github.yezhihao.protostar.DataType;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* @author yezhihao * @author yezhihao
* home https://gitee.com/yezhihao/jt808-server * home https://gitee.com/yezhihao/jt808-server
*/ */
@Repeatable(Fs.class)
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Field { public @interface Field {

15
src/test/java/io/github/yezhihao/protostar/multiversion/Test.java
View File

@ -4,7 +4,6 @@ import io.github.yezhihao.protostar.DataType;
import io.github.yezhihao.protostar.ProtostarUtil; import io.github.yezhihao.protostar.ProtostarUtil;
import io.github.yezhihao.protostar.Schema; import io.github.yezhihao.protostar.Schema;
import io.github.yezhihao.protostar.annotation.Field; import io.github.yezhihao.protostar.annotation.Field;
import io.github.yezhihao.protostar.annotation.Fs;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil; import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
@ -20,11 +19,12 @@ public class Test {
Schema<Foo> schema_v1 = multiVersionSchema.get(1); Schema<Foo> schema_v1 = multiVersionSchema.get(1);
ByteBuf buffer = Unpooled.buffer(32); ByteBuf buffer = Unpooled.buffer(32);
schema_v0.writeTo(buffer, foo()); Foo foo = foo();
schema_v0.writeTo(buffer, foo);
String hex = ByteBufUtil.hexDump(buffer); String hex = ByteBufUtil.hexDump(buffer);
System.out.println(hex); System.out.println(hex);
Foo foo = schema_v0.readFrom(buffer); foo = schema_v0.readFrom(buffer);
System.out.println(foo); System.out.println(foo);
System.out.println("=========================version: 0"); System.out.println("=========================version: 0");
@ -52,8 +52,8 @@ public class Test {
private int id; private int id;
private LocalDateTime dateTime; private LocalDateTime dateTime;
@Fs({@Field(index = 0, type = DataType.STRING, lengthSize = 1, desc = "名称", version = 0), @Field(index = 0, type = DataType.STRING, lengthSize = 1, desc = "名称", version = 0)
@Field(index = 0, type = DataType.STRING, length = 10, desc = "名称", version = 1)}) @Field(index = 0, type = DataType.STRING, length = 10, desc = "名称", version = 1)
public String getName() { public String getName() {
return name; return name;
} }
@ -62,8 +62,8 @@ public class Test {
this.name = name; this.name = name;
} }
@Fs({@Field(index = 1, type = DataType.WORD, desc = "ID", version = 0), @Field(index = 1, type = DataType.WORD, desc = "ID", version = 0)
@Field(index = 1, type = DataType.DWORD, desc = "ID", version = 1)}) @Field(index = 1, type = DataType.DWORD, desc = "ID", version = 1)
public int getId() { public int getId() {
return id; return id;
} }
@ -72,6 +72,7 @@ public class Test {
this.id = id; this.id = id;
} }
@Field(index = 3, type = DataType.BCD8421, desc = "日期", version = {0, 1})
@Field(index = 3, type = DataType.BCD8421, desc = "日期", version = {0, 1}) @Field(index = 3, type = DataType.BCD8421, desc = "日期", version = {0, 1})
public LocalDateTime getDateTime() { public LocalDateTime getDateTime() {
return dateTime; return dateTime;

5
src/test/java/io/github/yezhihao/protostar/simple/Test.java
View File

@ -21,11 +21,12 @@ public class Test {
Schema<Foo> schema = multiVersionSchema.get(0); Schema<Foo> schema = multiVersionSchema.get(0);
ByteBuf buffer = Unpooled.buffer(32); ByteBuf buffer = Unpooled.buffer(32);
schema.writeTo(buffer, foo()); Foo foo = foo();
schema.writeTo(buffer, foo);
String hex = ByteBufUtil.hexDump(buffer); String hex = ByteBufUtil.hexDump(buffer);
System.out.println(hex); System.out.println(hex);
Foo foo = schema.readFrom(buffer); foo = schema.readFrom(buffer);
System.out.println(foo); System.out.println(foo);
} }