tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-19 09:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref[protobuf]: refactor protobuf generate

Browse Source
This commit is contained in:
godotg
2023-12-03 17:27:10 +08:00
parent 516b3f93ab
commit 165bb0f98d
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java
+7 -18
View File
@@ -25,7 +25,7 @@ import java.util.*;
import static com.zfoo.protocol.util.FileUtils.LS;
import static com.zfoo.protocol.util.StringUtils.TAB;
public class GeneratePbUtils {
public abstract class GeneratePbUtils {
public static void create(PbGenerateOperation buildOption) {
var protoPathFile = new File(buildOption.getProtoPath());
@@ -137,17 +137,7 @@ public class GeneratePbUtils {
return javaType.getBoxedType();
}
private static void addImport(List<String> imps, String imp) {
if (imps == null) {
return;
}
if (!imps.contains(imp)) {
imps.add(imp);
}
}
private static void buildMsgImps(PbMessage msg, List<PbField> tmp, List<String> imps) {
private static void buildMsgImps(PbMessage msg, List<PbField> tmp, Set<String> imps) {
var fields = msg.getFields();
if (CollectionUtils.isNotEmpty(fields)) {
for (var field : fields) {
@@ -158,9 +148,9 @@ public class GeneratePbUtils {
for (int i = 0; i < tmp.size(); i++) {
if (tmp.get(i) instanceof PbMapField) {
addImport(imps, Map.class.getName());
imps.add(Map.class.getName());
} else if (tmp.get(i).getCardinality() == PbField.Cardinality.REPEATED) {
addImport(imps, List.class.getName());
imps.add(List.class.getName());
}
}
}
@@ -194,18 +184,17 @@ public class GeneratePbUtils {
}
public static String buildMessage(Proto proto, PbMessage msg, int indent, Map<String, String> defineMsgs, Map<String, Proto> protos) {
var level = Math.max(indent, 1);
var tmp = new ArrayList<PbField>();
var imps = new ArrayList<String>();
var imports = new HashSet<String>();
var builder = new StringBuilder();
buildMsgImps(msg, tmp, imps);
buildMsgImps(msg, tmp, imports);
List<PbField> fields = new ArrayList<>();
tmp.stream().sorted(Comparator.comparingInt(PbField::getTag))
.forEach(fields::add);
imps.stream().sorted(Comparator.naturalOrder())
imports.stream().sorted(Comparator.naturalOrder())
.forEach(it -> builder.append(StringUtils.format("import {};", it)).append(LS));
buildDocComment(builder, msg);