Skip to content

Commit 1cbcaac

Browse files
jaysunxiaojaysunxiao
committed
ref[protocol]: simplify gdscript generation
1 parent b25a995 commit 1cbcaac

12 files changed

+127
-162
lines changed

‎protocol/src/main/java/com/zfoo/protocol/serializer/CutDownArraySerializer.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ public boolean writeObject(StringBuilder builder, String objectStr, Field field,
503503
case Enhance:
504504
builder.append(StringUtils.format("{}.writePacketArray($1, {}, {});", EnhanceUtils.byteBufUtils, objectStr, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
505505
break;
506-
case GdScript, Python, Ruby, Swift:
506+
case GdScript:
507+
builder.append(StringUtils.format("buffer.writePacketArray({}, {})", objectStr, protocolName)).append(LS);
508+
break;
509+
case Python, Ruby, Swift:
507510
builder.append(StringUtils.format("buffer.writePacketArray({}, {})", objectStr, protocolId)).append(LS);
508511
break;
509512
case Lua:
@@ -1287,7 +1290,7 @@ public String readObject(StringBuilder builder, Field field, IFieldRegistration
12871290
builder.append(StringUtils.format("let {} = buffer.readPacketArray({}) as! Array<{}>", array, protocolId, protocolName)).append(LS);
12881291
break;
12891292
case GdScript:
1290-
builder.append(StringUtils.format("var {} = buffer.readPacketArray({})", array, protocolId)).append(LS);
1293+
builder.append(StringUtils.format("var {} = buffer.readPacketArray({})", array, protocolName)).append(LS);
12911294
break;
12921295
case Python, Ruby:
12931296
builder.append(StringUtils.format("{} = buffer.readPacketArray({})", array, protocolId)).append(LS);

‎protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,15 @@ public boolean writeObject(StringBuilder builder, String objectStr, Field field,
316316
// List<IProtocol>
317317
if (listField.getListElementRegistration() instanceof ObjectProtocolField) {
318318
var protocolId = ((ObjectProtocolField) listField.getListElementRegistration()).getProtocolId();
319+
var protocolName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId);
319320
switch (language) {
320321
case Enhance:
321322
builder.append(StringUtils.format("{}.writePacketList($1, (List){}, {});", EnhanceUtils.byteBufUtils, objectStr, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
322323
break;
323-
case GdScript, Python, Ruby, Swift:
324+
case GdScript:
325+
builder.append(StringUtils.format("buffer.writePacketArray({}, {})", objectStr, protocolName)).append(LS);
326+
break;
327+
case Python, Ruby, Swift:
324328
builder.append(StringUtils.format("buffer.writePacketArray({}, {})", objectStr, protocolId)).append(LS);
325329
break;
326330
case Lua:
@@ -765,7 +769,7 @@ public String readObject(StringBuilder builder, Field field, IFieldRegistration
765769
builder.append(StringUtils.format("let {} = buffer.readPacketArray({}) as! Array<{}>", list, protocolId, protocolName)).append(LS);
766770
break;
767771
case GdScript:
768-
builder.append(StringUtils.format("var {} = buffer.readPacketArray({})", list, protocolId)).append(LS);
772+
builder.append(StringUtils.format("var {} = buffer.readPacketArray({})", list, protocolName)).append(LS);
769773
break;
770774
case Python, Ruby:
771775
builder.append(StringUtils.format("{} = buffer.readPacketArray({})", list, protocolId)).append(LS);

‎protocol/src/main/java/com/zfoo/protocol/serializer/CutDownMapSerializer.java

+18-6
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,15 @@ public boolean writeObject(StringBuilder builder, String objectStr, Field field,
134134
}
135135
} else if (valueSerializer == ObjectProtocolSerializer.INSTANCE) {
136136
var protocolId = ((ObjectProtocolField) valueRegistration).getProtocolId();
137+
var protocolName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId);
137138
switch (language) {
138139
case Enhance:
139140
builder.append(StringUtils.format("{}.writeIntPacketMap($1, (Map){}, {});", EnhanceUtils.byteBufUtils, objectStr, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
140141
return true;
141-
case Kotlin, Scala, GdScript, Python, Ruby, Swift:
142+
case GdScript:
143+
builder.append(StringUtils.format("buffer.writeIntPacketMap({}, {})", objectStr, protocolName)).append(LS);
144+
return true;
145+
case Kotlin, Scala, Python, Ruby, Swift:
142146
builder.append(StringUtils.format("buffer.writeIntPacketMap({}, {})", objectStr, protocolId)).append(LS);
143147
return true;
144148
case Lua:
@@ -244,11 +248,15 @@ public boolean writeObject(StringBuilder builder, String objectStr, Field field,
244248
}
245249
} else if (valueSerializer == ObjectProtocolSerializer.INSTANCE) {
246250
var protocolId = ((ObjectProtocolField) valueRegistration).getProtocolId();
251+
var protocolName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId);
247252
switch (language) {
248253
case Enhance:
249254
builder.append(StringUtils.format("{}.writeLongPacketMap($1, (Map){}, {});", EnhanceUtils.byteBufUtils, objectStr, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
250255
return true;
251-
case Kotlin, Scala, GdScript, Python, Ruby, Swift:
256+
case GdScript:
257+
builder.append(StringUtils.format("buffer.writeLongPacketMap({}, {})", objectStr, protocolName)).append(LS);
258+
return true;
259+
case Kotlin, Scala, Python, Ruby, Swift:
252260
builder.append(StringUtils.format("buffer.writeLongPacketMap({}, {})", objectStr, protocolId)).append(LS);
253261
return true;
254262
case Lua:
@@ -354,11 +362,15 @@ public boolean writeObject(StringBuilder builder, String objectStr, Field field,
354362
}
355363
} else if (valueSerializer == ObjectProtocolSerializer.INSTANCE) {
356364
var protocolId = ((ObjectProtocolField) valueRegistration).getProtocolId();
365+
var protocolName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId);
357366
switch (language) {
358367
case Enhance:
359368
builder.append(StringUtils.format("{}.writeStringPacketMap($1, (Map){}, {});", EnhanceUtils.byteBufUtils, objectStr, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
360369
return true;
361-
case Kotlin, Scala, GdScript, Python, Ruby, Swift:
370+
case GdScript:
371+
builder.append(StringUtils.format("buffer.writeStringPacketMap({}, {})", objectStr, protocolName)).append(LS);
372+
return true;
373+
case Kotlin, Scala, Python, Ruby, Swift:
362374
builder.append(StringUtils.format("buffer.writeStringPacketMap({}, {})", objectStr, protocolId)).append(LS);
363375
return true;
364376
case Lua:
@@ -546,7 +558,7 @@ public String readObject(StringBuilder builder, Field field, IFieldRegistration
546558
builder.append(StringUtils.format("let {} = buffer.readIntPacketMap({}) as! Dictionary<Int, {}>", map, protocolId, protocolName)).append(LS);
547559
return map;
548560
case GdScript:
549-
builder.append(StringUtils.format("var {} = buffer.readIntPacketMap({})", map, protocolId)).append(LS);
561+
builder.append(StringUtils.format("var {} = buffer.readIntPacketMap({})", map, protocolName)).append(LS);
550562
return map;
551563
case Python, Ruby:
552564
builder.append(StringUtils.format("{} = buffer.readIntPacketMap({})", map, protocolId)).append(LS);
@@ -732,7 +744,7 @@ public String readObject(StringBuilder builder, Field field, IFieldRegistration
732744
builder.append(StringUtils.format("let {} = buffer.readLongPacketMap({}) as! Dictionary<Int64, {}>", map, protocolId, protocolName)).append(LS);
733745
return map;
734746
case GdScript:
735-
builder.append(StringUtils.format("var {} = buffer.readLongPacketMap({})", map, protocolId)).append(LS);
747+
builder.append(StringUtils.format("var {} = buffer.readLongPacketMap({})", map, protocolName)).append(LS);
736748
return map;
737749
case Python, Ruby:
738750
builder.append(StringUtils.format("{} = buffer.readLongPacketMap({})", map, protocolId)).append(LS);
@@ -919,7 +931,7 @@ public String readObject(StringBuilder builder, Field field, IFieldRegistration
919931
builder.append(StringUtils.format("let {} = buffer.readStringPacketMap({}) as! Dictionary<String, {}>", map, protocolId, protocolName)).append(LS);
920932
return map;
921933
case GdScript:
922-
builder.append(StringUtils.format("var {} = buffer.readStringPacketMap({})", map, protocolId)).append(LS);
934+
builder.append(StringUtils.format("var {} = buffer.readStringPacketMap({})", map, protocolName)).append(LS);
923935
return map;
924936
case Python, Ruby:
925937
builder.append(StringUtils.format("{} = buffer.readStringPacketMap({})", map, protocolId)).append(LS);

‎protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,13 @@ public boolean writeObject(StringBuilder builder, String objectStr, Field field,
309309
// Set<IProtocol>
310310
if (setField.getSetElementRegistration() instanceof ObjectProtocolField) {
311311
var protocolId = ((ObjectProtocolField) setField.getSetElementRegistration()).getProtocolId();
312+
var protocolName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId);
312313
switch (language) {
313314
case Enhance:
314315
builder.append(StringUtils.format("{}.writePacketSet($1, (Set){}, {});", EnhanceUtils.byteBufUtils, objectStr, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
315316
break;
316317
case GdScript:
317-
builder.append(StringUtils.format("buffer.writePacketArray({}, {})", objectStr, protocolId)).append(LS);
318+
builder.append(StringUtils.format("buffer.writePacketArray({}, {})", objectStr, protocolName)).append(LS);
318319
break;
319320
case Kotlin, Scala, Python, Ruby:
320321
builder.append(StringUtils.format("buffer.writePacketSet({}, {})", objectStr, protocolId)).append(LS);
@@ -751,7 +752,7 @@ public String readObject(StringBuilder builder, Field field, IFieldRegistration
751752
builder.append(StringUtils.format("Set {} = {}.readPacketSet($1, {});", set, EnhanceUtils.byteBufUtils, EnhanceUtils.getProtocolRegistrationFieldNameByProtocolId(protocolId)));
752753
break;
753754
case GdScript:
754-
builder.append(StringUtils.format("var {} = buffer.readPacketArray({})", set, protocolId)).append(LS);
755+
builder.append(StringUtils.format("var {} = buffer.readPacketArray({})", set, protocolName)).append(LS);
755756
break;
756757
case Python, Ruby:
757758
builder.append(StringUtils.format("{} = buffer.readPacketSet({})", set, protocolId)).append(LS);

0 commit comments

Comments
 (0)