From 0ba1c6e41940b69b20866cf270f79285af9d4974 Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 3 Dec 2023 16:29:09 +0800 Subject: [PATCH] ref[protobuf]: refactor protobuf generate --- .../serializer/protobuf/GeneratePbUtils.java | 28 +++++++-------- .../protobuf/{wire => }/PbField.java | 5 ++- ...ldOption.java => PbGenerateOperation.java} | 4 +-- .../{wire/MapField.java => PbMapField.java} | 7 ++-- .../ProtoMessage.java => PbMessage.java} | 17 +++++---- .../{wire/Option.java => PbOption.java} | 7 ++-- .../protobuf/{wire => }/Syntax.java | 5 ++- .../serializer/protobuf/parser/Proto.java | 19 +++++----- .../protobuf/parser/ProtoParser.java | 36 +++++++++---------- .../protocol/protobuf/AllTypeBuilderTest.java | 5 ++- 10 files changed, 62 insertions(+), 71 deletions(-) rename protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/{wire => }/PbField.java (96%) rename protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/{PbBuildOption.java => PbGenerateOperation.java} (92%) rename protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/{wire/MapField.java => PbMapField.java} (88%) rename protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/{wire/ProtoMessage.java => PbMessage.java} (79%) rename protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/{wire/Option.java => PbOption.java} (90%) rename protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/{wire => }/Syntax.java (90%) diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java index 236d5ff5..d9cbe1b6 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java @@ -15,10 +15,6 @@ package com.zfoo.protocol.serializer.protobuf; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.serializer.protobuf.parser.TypeProtobuf; -import com.zfoo.protocol.serializer.protobuf.wire.MapField; -import com.zfoo.protocol.serializer.protobuf.wire.Option; -import com.zfoo.protocol.serializer.protobuf.wire.PbField; -import com.zfoo.protocol.serializer.protobuf.wire.ProtoMessage; import com.zfoo.protocol.serializer.protobuf.parser.Proto; import com.zfoo.protocol.serializer.protobuf.parser.ProtoParser; import com.zfoo.protocol.util.FileUtils; @@ -32,7 +28,7 @@ import static com.zfoo.protocol.util.StringUtils.TAB; public class GeneratePbUtils { - public static void create(PbBuildOption buildOption) { + public static void create(PbGenerateOperation buildOption) { var protoPathFile = new File(buildOption.getProtoPath()); if (!protoPathFile.exists()) { throw new RuntimeException(StringUtils.format("proto path:[{}] not exist", buildOption.getProtoPath())); @@ -71,14 +67,14 @@ public class GeneratePbUtils { } - public static void generate(PbBuildOption buildOption, List protos) { + public static void generate(PbGenerateOperation buildOption, List protos) { Map allProtos = new HashMap<>(); for (Proto proto : protos) { allProtos.put(proto.getName(), proto); } for (var proto : protos) { - List