tiennm99/zfoo
1
0 Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-10-03 05:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref[protocol]: rename writeBoolean/readBoolean to writeBool/readBool

Browse Source
This commit is contained in:
godotg committed 2024-07-14 18:26:03 +08:00
1 parent a77941232a
commit 61de266935
11 files changed
+116 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

protocol/src/main/java/com/zfoo/protocol/buffer/ByteBufUtils.java
+22 -22
View File
@@ -71,23 +71,23 @@ public abstract class ByteBufUtils {
}
//---------------------------------boolean--------------------------------------
public static void writeBoolean(ByteBuf byteBuf, boolean value) {
public static void writeBool(ByteBuf byteBuf, boolean value) {
byteBuf.writeBoolean(value);
}
public static boolean readBoolean(ByteBuf byteBuf) {
public static boolean readBool(ByteBuf byteBuf) {
return byteBuf.readBoolean();
}
public static boolean tryReadBoolean(ByteBuf byteBuf) {
return byteBuf.isReadable() && readBoolean(byteBuf);
public static boolean tryReadBool(ByteBuf byteBuf) {
return byteBuf.isReadable() && readBool(byteBuf);
}
public static void writeBooleanBox(ByteBuf byteBuf, Boolean value) {
public static void writeBoolBox(ByteBuf byteBuf, Boolean value) {
byteBuf.writeBoolean(value != null && value);
}
public static Boolean readBooleanBox(ByteBuf byteBuf) {
public static Boolean readBoolBox(ByteBuf byteBuf) {
return byteBuf.readBoolean();
}
@@ -698,7 +698,7 @@ public abstract class ByteBufUtils {
}
//---------------------------------boolean--------------------------------------
public static void writeBooleanArray(ByteBuf byteBuf, boolean[] array) {
public static void writeBoolArray(ByteBuf byteBuf, boolean[] array) {
if (array == null) {
byteBuf.writeByte(0);
return;
@@ -712,7 +712,7 @@ public abstract class ByteBufUtils {
byteBuf.writeBytes(bytes);
}
public static boolean[] readBooleanArray(ByteBuf byteBuf) {
public static boolean[] readBoolArray(ByteBuf byteBuf) {
var length = readInt(byteBuf);
var bytes = new byte[CollectionUtils.comfortableByteLength(length)];
var array = new boolean[length];
@@ -723,54 +723,54 @@ public abstract class ByteBufUtils {
return array;
}
public static void writeBooleanBoxArray(ByteBuf byteBuf, Boolean[] array) {
public static void writeBoolBoxArray(ByteBuf byteBuf, Boolean[] array) {
if (array == null) {
byteBuf.writeByte(0);
return;
}
writeInt(byteBuf, array.length);
for (var value : array) {
writeBooleanBox(byteBuf, value);
writeBoolBox(byteBuf, value);
}
}
public static Boolean[] readBooleanBoxArray(ByteBuf byteBuf) {
public static Boolean[] readBoolBoxArray(ByteBuf byteBuf) {
var length = readInt(byteBuf);
var array = new Boolean[CollectionUtils.comfortableByteLength(length)];
for (var i = 0; i < length; i++) {
array[i] = readBooleanBox(byteBuf);
array[i] = readBoolBox(byteBuf);
}
return array;
}
public static void writeBooleanCollection(ByteBuf byteBuf, Collection<Boolean> collection) {
public static void writeBoolCollection(ByteBuf byteBuf, Collection<Boolean> collection) {
if (collection == null) {
byteBuf.writeByte(0);
return;
}
writeInt(byteBuf, collection.size());
for (var value : collection) {
writeBooleanBox(byteBuf, value);
writeBoolBox(byteBuf, value);
}
}
public static void writeBooleanList(ByteBuf byteBuf, List<Boolean> list) {
writeBooleanCollection(byteBuf, list);
public static void writeBoolList(ByteBuf byteBuf, List<Boolean> list) {
writeBoolCollection(byteBuf, list);
}
public static List<Boolean> readBooleanList(ByteBuf byteBuf) {
return new ArrayListBoolean(readBooleanArray(byteBuf));
public static List<Boolean> readBoolList(ByteBuf byteBuf) {
return new ArrayListBoolean(readBoolArray(byteBuf));
}
public static void writeBooleanSet(ByteBuf byteBuf, Set<Boolean> set) {
writeBooleanCollection(byteBuf, set);
public static void writeBoolSet(ByteBuf byteBuf, Set<Boolean> set) {
writeBoolCollection(byteBuf, set);
}
public static Set<Boolean> readBooleanSet(ByteBuf byteBuf) {
public static Set<Boolean> readBoolSet(ByteBuf byteBuf) {
var length = readInt(byteBuf);
Set<Boolean> set = CollectionUtils.newSet(length);
for (var i = 0; i < length; i++) {
set.add(readBooleanBox(byteBuf));
set.add(readBoolBox(byteBuf));
}
return set;
}
protocol/src/main/java/com/zfoo/protocol/serializer/CutDownArraySerializer.java
+33 -33
View File
@@ -48,25 +48,25 @@ public class CutDownArraySerializer implements ICutDownSerializer {
case "boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("{}.writeBooleanArray($1, {});", EnhanceUtils.byteBufUtils, objectStr));
builder.append(StringUtils.format("{}.writeBoolArray($1, {});", EnhanceUtils.byteBufUtils, objectStr));
break;
case Kotlin, Scala, GdScript, Python:
builder.append(StringUtils.format("buffer.writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolArray({})", objectStr)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("buffer:writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer:writeBoolArray({})", objectStr)).append(LS);
break;
case Php:
builder.append(StringUtils.format("$buffer->writeBoolArray({});", objectStr)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("buffer.WriteBooleanArray({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolArray({});", objectStr)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("buffer.WriteBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolArray({})", objectStr)).append(LS);
break;
case Cpp, Java, JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("buffer.writeBooleanArray({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolArray({});", objectStr)).append(LS);
break;
default:
flag = false;
@@ -75,25 +75,25 @@ public class CutDownArraySerializer implements ICutDownSerializer {
case "Boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("{}.writeBooleanBoxArray($1, {});", EnhanceUtils.byteBufUtils, objectStr));
builder.append(StringUtils.format("{}.writeBoolBoxArray($1, {});", EnhanceUtils.byteBufUtils, objectStr));
break;
case Kotlin, Scala, GdScript, Python:
builder.append(StringUtils.format("buffer.writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolArray({})", objectStr)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("buffer:writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer:writeBoolArray({})", objectStr)).append(LS);
break;
case Php:
builder.append(StringUtils.format("$buffer->writeBoolArray({});", objectStr)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("buffer.WriteBooleanArray({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolArray({});", objectStr)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("buffer.WriteBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolArray({})", objectStr)).append(LS);
break;
case Cpp, JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("buffer.writeBooleanArray({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolArray({});", objectStr)).append(LS);
break;
default:
flag = false;
@@ -501,41 +501,41 @@ public class CutDownArraySerializer implements ICutDownSerializer {
case "boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("{}[] {} = {}.readBooleanArray($1);", arrayName, array, EnhanceUtils.byteBufUtils));
builder.append(StringUtils.format("{}[] {} = {}.readBoolArray($1);", arrayName, array, EnhanceUtils.byteBufUtils));
break;
case GdScript:
builder.append(StringUtils.format("var {} = buffer.readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolArray()", array)).append(LS);
break;
case Python:
builder.append(StringUtils.format("{} = buffer.readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("{} = buffer.readBoolArray()", array)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("local {} = buffer:readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("local {} = buffer:readBoolArray()", array)).append(LS);
break;
case Php:
array = "$" + array;
builder.append(StringUtils.format("{} = $buffer->readBoolArray();", array)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolArray();", array)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolArray()", array)).append(LS);
break;
case Cpp:
builder.append(StringUtils.format("auto {} = buffer.readBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("auto {} = buffer.readBoolArray();", array)).append(LS);
break;
case Java:
builder.append(StringUtils.format("var {} = buffer.readBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolArray();", array)).append(LS);
break;
case Kotlin:
builder.append(StringUtils.format("val {} = buffer.readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolArray()", array)).append(LS);
break;
case Scala:
builder.append(StringUtils.format("val {} = buffer.readBooleanArray", array)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolArray", array)).append(LS);
break;
case JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("const {} = buffer.readBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("const {} = buffer.readBoolArray();", array)).append(LS);
break;
default:
flag = false;
@@ -544,38 +544,38 @@ public class CutDownArraySerializer implements ICutDownSerializer {
case "Boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("{}[] {} = {}.readBooleanBoxArray($1);", arrayName, array, EnhanceUtils.byteBufUtils));
builder.append(StringUtils.format("{}[] {} = {}.readBoolBoxArray($1);", arrayName, array, EnhanceUtils.byteBufUtils));
break;
case GdScript:
builder.append(StringUtils.format("var {} = buffer.readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolArray()", array)).append(LS);
break;
case Python:
builder.append(StringUtils.format("{} = buffer.readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("{} = buffer.readBoolArray()", array)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("local {} = buffer:readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("local {} = buffer:readBoolArray()", array)).append(LS);
break;
case Php:
array = "$" + array;
builder.append(StringUtils.format("{} = $buffer->readBoolArray();", array)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolArray();", array)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolArray()", array)).append(LS);
break;
case Cpp:
builder.append(StringUtils.format("auto {} = buffer.readBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("auto {} = buffer.readBoolArray();", array)).append(LS);
break;
case Kotlin:
builder.append(StringUtils.format("val {} = buffer.readBooleanArray()", array)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolArray()", array)).append(LS);
break;
case Scala:
builder.append(StringUtils.format("val {} = buffer.readBooleanArray", array)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolArray", array)).append(LS);
break;
case JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("const {} = buffer.readBooleanArray();", array)).append(LS);
builder.append(StringUtils.format("const {} = buffer.readBoolArray();", array)).append(LS);
break;
default:
flag = false;
protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java
+18 -18
View File
@@ -47,28 +47,28 @@ public class CutDownListSerializer implements ICutDownSerializer {
case "Boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("{}.writeBooleanList($1, (List){});", EnhanceUtils.byteBufUtils, objectStr));
builder.append(StringUtils.format("{}.writeBoolList($1, (List){});", EnhanceUtils.byteBufUtils, objectStr));
break;
case GdScript, Python:
builder.append(StringUtils.format("buffer.writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolArray({})", objectStr)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("buffer:writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer:writeBoolArray({})", objectStr)).append(LS);
break;
case Php:
builder.append(StringUtils.format("$buffer->writeBoolArray({});", objectStr)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("buffer.WriteBooleanList({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolList({});", objectStr)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("buffer.WriteBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolArray({})", objectStr)).append(LS);
break;
case Cpp, Java, JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("buffer.writeBooleanList({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolList({});", objectStr)).append(LS);
break;
case Kotlin, Scala:
builder.append(StringUtils.format("buffer.writeBooleanList({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolList({})", objectStr)).append(LS);
break;
default:
flag = false;
@@ -340,41 +340,41 @@ public class CutDownListSerializer implements ICutDownSerializer {
case "Boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("List {} = {}.readBooleanList($1);", list, EnhanceUtils.byteBufUtils));
builder.append(StringUtils.format("List {} = {}.readBoolList($1);", list, EnhanceUtils.byteBufUtils));
break;
case GdScript:
builder.append(StringUtils.format("var {} = buffer.readBooleanArray()", list)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolArray()", list)).append(LS);
break;
case Python:
builder.append(StringUtils.format("{} = buffer.readBooleanArray()", list)).append(LS);
builder.append(StringUtils.format("{} = buffer.readBoolArray()", list)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("local {} = buffer:readBooleanArray()", list)).append(LS);
builder.append(StringUtils.format("local {} = buffer:readBoolArray()", list)).append(LS);
break;
case Php:
list = "$" + list;
builder.append(StringUtils.format("{} = buffer->readBoolArray();", list)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanList();", list)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolList();", list)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanArray()", list)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolArray()", list)).append(LS);
break;
case Cpp:
builder.append(StringUtils.format("auto {} = buffer.readBooleanList();", list)).append(LS);
builder.append(StringUtils.format("auto {} = buffer.readBoolList();", list)).append(LS);
break;
case Java:
builder.append(StringUtils.format("var {} = buffer.readBooleanList();", list)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolList();", list)).append(LS);
break;
case Kotlin:
builder.append(StringUtils.format("val {} = buffer.readBooleanList()", list)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolList()", list)).append(LS);
break;
case Scala:
builder.append(StringUtils.format("val {} = buffer.readBooleanList", list)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolList", list)).append(LS);
break;
case JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("const {} = buffer.readBooleanList();", list)).append(LS);
builder.append(StringUtils.format("const {} = buffer.readBoolList();", list)).append(LS);
break;
default:
flag = false;
protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java
+18 -18
View File
@@ -48,28 +48,28 @@ public class CutDownSetSerializer implements ICutDownSerializer {
case "Boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("{}.writeBooleanSet($1, (Set){});", EnhanceUtils.byteBufUtils, objectStr));
builder.append(StringUtils.format("{}.writeBoolSet($1, (Set){});", EnhanceUtils.byteBufUtils, objectStr));
break;
case GdScript:
builder.append(StringUtils.format("buffer.writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolArray({})", objectStr)).append(LS);
break;
case Python, Kotlin, Scala:
builder.append(StringUtils.format("buffer.writeBooleanSet({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolSet({})", objectStr)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("buffer:writeBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer:writeBoolArray({})", objectStr)).append(LS);
break;
case Php:
builder.append(StringUtils.format("$buffer->writeBoolArray({});", objectStr)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("buffer.WriteBooleanSet({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolSet({});", objectStr)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("buffer.WriteBooleanArray({})", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.WriteBoolArray({})", objectStr)).append(LS);
break;
case Cpp, Java, JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("buffer.writeBooleanSet({});", objectStr)).append(LS);
builder.append(StringUtils.format("buffer.writeBoolSet({});", objectStr)).append(LS);
break;
default:
flag = false;
@@ -337,41 +337,41 @@ public class CutDownSetSerializer implements ICutDownSerializer {
case "Boolean":
switch (language) {
case Enhance:
builder.append(StringUtils.format("Set {} = {}.readBooleanSet($1);", set, EnhanceUtils.byteBufUtils));
builder.append(StringUtils.format("Set {} = {}.readBoolSet($1);", set, EnhanceUtils.byteBufUtils));
break;
case GdScript:
builder.append(StringUtils.format("var {} = buffer.readBooleanArray()", set)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolArray()", set)).append(LS);
break;
case Python:
builder.append(StringUtils.format("{} = buffer.readBooleanSet()", set)).append(LS);
builder.append(StringUtils.format("{} = buffer.readBoolSet()", set)).append(LS);
break;
case Lua:
builder.append(StringUtils.format("local {} = buffer:readBooleanArray()", set)).append(LS);
builder.append(StringUtils.format("local {} = buffer:readBoolArray()", set)).append(LS);
break;
case Php:
set = "$" + set;
builder.append(StringUtils.format("{} = $buffer->readBoolArray();", set)).append(LS);
break;
case CSharp:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanSet();", set)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolSet();", set)).append(LS);
break;
case Golang:
builder.append(StringUtils.format("var {} = buffer.ReadBooleanArray()", set)).append(LS);
builder.append(StringUtils.format("var {} = buffer.ReadBoolArray()", set)).append(LS);
break;
case Cpp:
builder.append(StringUtils.format("auto {} = buffer.readBooleanSet();", set)).append(LS);
builder.append(StringUtils.format("auto {} = buffer.readBoolSet();", set)).append(LS);
break;
case Java:
builder.append(StringUtils.format("var {} = buffer.readBooleanSet();", set)).append(LS);
builder.append(StringUtils.format("var {} = buffer.readBoolSet();", set)).append(LS);
break;
case Kotlin:
builder.append(StringUtils.format("val {} = buffer.readBooleanSet()", set)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolSet()", set)).append(LS);
break;
case Scala:
builder.append(StringUtils.format("val {} = buffer.readBooleanSet", set)).append(LS);
builder.append(StringUtils.format("val {} = buffer.readBoolSet", set)).append(LS);
break;
case JavaScript, EcmaScript, TypeScript:
builder.append(StringUtils.format("const {} = buffer.readBooleanSet();", set)).append(LS);
builder.append(StringUtils.format("const {} = buffer.readBoolSet();", set)).append(LS);
break;
default:
flag = false;
protocol/src/main/java/com/zfoo/protocol/serializer/enhance/EnhanceBoolSerializer.java
+4 -4
View File
@@ -28,9 +28,9 @@ public class EnhanceBoolSerializer implements IEnhanceSerializer {
@Override
public void writeObject(StringBuilder builder, String objectStr, Field field, IFieldRegistration fieldRegistration) {
if (isPrimitiveField(field)) {
builder.append(StringUtils.format("{}.writeBoolean($1, {});", EnhanceUtils.byteBufUtils, objectStr));
builder.append(StringUtils.format("{}.writeBool($1, {});", EnhanceUtils.byteBufUtils, objectStr));
} else {
builder.append(StringUtils.format("{}.writeBooleanBox($1, (Boolean){});", EnhanceUtils.byteBufUtils, objectStr));
builder.append(StringUtils.format("{}.writeBoolBox($1, (Boolean){});", EnhanceUtils.byteBufUtils, objectStr));
}
}
@@ -38,9 +38,9 @@ public class EnhanceBoolSerializer implements IEnhanceSerializer {
public String readObject(StringBuilder builder, Field field, IFieldRegistration fieldRegistration) {
var result = "result" + GenerateProtocolFile.localVariableId++;
if (isPrimitiveField(field)) {
builder.append(StringUtils.format("boolean {} = {}.readBoolean($1);", result, EnhanceUtils.byteBufUtils));
builder.append(StringUtils.format("boolean {} = {}.readBool($1);", result, EnhanceUtils.byteBufUtils));
} else {
builder.append(StringUtils.format("Boolean {} = {}.readBooleanBox($1);", result, EnhanceUtils.byteBufUtils));
builder.append(StringUtils.format("Boolean {} = {}.readBoolBox($1);", result, EnhanceUtils.byteBufUtils));
}
return result;
}
protocol/src/main/java/com/zfoo/protocol/serializer/java/CodeGenerateJava.java
+1 -1
View File
@@ -303,7 +303,7 @@ public class CodeGenerateJava implements ICodeGenerate {
var fieldRegistrations = registration.getFieldRegistrations();
var javaBuilder = new StringBuilder();
if (registration.isCompatible()) {
javaBuilder.append("int beforeWriteIndex = buffer.writeOffset();").append(LS);
javaBuilder.append("int beforeWriteIndex = buffer.getWriteOffset();").append(LS);
javaBuilder.append(StringUtils.format("buffer.writeInt({});", registration.getPredictionLength())).append(LS);
} else {
javaBuilder.append("buffer.writeInt(-1);").append(LS);
protocol/src/main/java/com/zfoo/protocol/serializer/reflect/BoolSerializer.java
+2 -2
View File
@@ -26,12 +26,12 @@ public class BoolSerializer implements ISerializer {
@Override
public void writeObject(ByteBuf buffer, Object object, IFieldRegistration fieldRegistration) {
ByteBufUtils.writeBooleanBox(buffer, (Boolean) object);
ByteBufUtils.writeBoolBox(buffer, (Boolean) object);
}
@Override
public Object readObject(ByteBuf buffer, IFieldRegistration fieldRegistration) {
return ByteBufUtils.readBooleanBox(buffer);
return ByteBufUtils.readBoolBox(buffer);
}
@Override
protocol/src/main/resources/java/ByteBuffer.java
+13 -8
View File
@@ -37,7 +37,12 @@ public class ByteBuffer {
}
// -------------------------------------------------get/set-------------------------------------------------
public int writeOffset() {
public byte[] getBuffer() {
return buffer;
}
public int getWriteOffset() {
return writeOffset;
}
@@ -49,7 +54,7 @@ public class ByteBuffer {
writeOffset = writeIndex;
}
public int readOffset() {
public int getReadOffset() {
return readOffset;
}
@@ -382,7 +387,7 @@ public class ByteBuffer {
return new String(bytes, DEFAULT_CHARSET);
}
public void writeBooleanArray(boolean[] array) {
public void writeBoolArray(boolean[] array) {
if ((array == null) || (array.length == 0)) {
writeInt(0);
} else {
@@ -394,7 +399,7 @@ public class ByteBuffer {
}
}
public boolean[] readBooleanArray() {
public boolean[] readBoolArray() {
int size = readInt();
boolean[] array = new boolean[size];
if (size > 0) {
@@ -566,7 +571,7 @@ public class ByteBuffer {
return array;
}
public void writeBooleanList(List<Boolean> list) {
public void writeBoolList(List<Boolean> list) {
if ((list == null) || list.isEmpty()) {
writeInt(0);
} else {
@@ -577,7 +582,7 @@ public class ByteBuffer {
}
}
public List<Boolean> readBooleanList() {
public List<Boolean> readBoolList() {
int size = readInt();
List<Boolean> list = new ArrayList<>();
if (size > 0) {
@@ -766,7 +771,7 @@ public class ByteBuffer {
return list;
}
public void writeBooleanSet(Set<Boolean> set) {
public void writeBoolSet(Set<Boolean> set) {
if ((set == null) || set.isEmpty()) {
writeInt(0);
} else {
@@ -777,7 +782,7 @@ public class ByteBuffer {
}
}
public Set<Boolean> readBooleanSet() {
public Set<Boolean> readBoolSet() {
int size = readInt();
Set<Boolean> set = new HashSet<>();
if (size > 0) {
protocol/src/main/resources/java/ProtocolRegistrationTemplate.java
+1 -1
View File
@@ -20,7 +20,7 @@ class ${protocol_name}Registration implements IProtocolRegistration {
if (length == 0) {
return null;
}
var beforeReadIndex = buffer.readOffset();
var beforeReadIndex = buffer.getReadOffset();
var packet = new ${protocol_name}();
${protocol_read_deserialization}
if (length > 0) {
protocol/src/test/kotlin/Main.java
+1 -1
View File
@@ -165,7 +165,7 @@ public class Main {
var equal = 0;
var notEqual = 0;
for (int i = 0; i < buffer.writeOffset(); i++) {
for (int i = 0; i < buffer.getWriteOffset(); i++) {
var a = buffer.readByte();
var b = newBuffer.readByte();
if (a == b) {