diff --git a/HISTORY.md b/HISTORY.md index 28a77fc0..eeaa860c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,13 @@ ## Unrelease +## 2.16.1 + +1. 修复字段别名的一处错误 +2. 更新依赖库 + + `com.google.protobuf` -> 4.27.2 + + `org.apache.poi` -> 5.3.0 + ## 2.16.0 1. 增加int32和uint32的范围检测。 diff --git a/pom.xml b/pom.xml index 38d59305..e0d1ce26 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.xresloader xresloader - 2.16.0 + 2.16.1 jar xresloader @@ -249,24 +249,24 @@ com.google.protobuf protobuf-java - 4.27.0 + 4.27.2 com.google.protobuf protobuf-java-util - 4.27.0 + 4.27.2 org.apache.poi poi-ooxml - 5.2.5 + 5.3.0 org.apache.poi poi - 5.2.5 + 5.3.0 diff --git a/src/org/xresloader/core/data/dst/DataDstPb.java b/src/org/xresloader/core/data/dst/DataDstPb.java index 332e2e61..e44152f8 100644 --- a/src/org/xresloader/core/data/dst/DataDstPb.java +++ b/src/org/xresloader/core/data/dst/DataDstPb.java @@ -1156,7 +1156,9 @@ public final DataDstWriterNode compile() throws ConvException { return ret; } - throw new ConvException(String.format("protocol %s compile mapping relationship failed", name())); + throw new ConvException(String.format( + "Protocol %s compile mapping relationship failed, maybe can not find any message's field in KeyRow", + name())); } @Override @@ -1364,8 +1366,7 @@ private boolean testMessage(DataDstWriterNode node, LinkedList name_list for (Descriptors.FieldDescriptor fd : desc.getFields()) { DataDstChildrenNode child = null; ArrayList field_alias = null; - if (enable_alias_mapping && fd.getOptions().hasExtension(Xresloader.fieldAlias) - && fd.getOptions().getExtensionCount(Xresloader.fieldAlias) > 0) { + if (enable_alias_mapping && fd.getOptions().getExtensionCount(Xresloader.fieldAlias) > 0) { field_alias = new ArrayList<>(); field_alias.ensureCapacity(fd.getOptions().getExtensionCount(Xresloader.fieldAlias)); for (String alias_name : fd.getOptions().getExtension(Xresloader.fieldAlias)) {