Merge pull request #41 from owent/dev

Prepare for v2.16.1
owent · Jul 11, 2024 · 9c3c768 · 9c3c768
2 parents 0cd0861 + 8ce0776
commit 9c3c768
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -6,7 +6,7 @@
 
     <groupId>org.xresloader</groupId>
     <artifactId>xresloader</artifactId>
-    <version>2.16.0</version>
+    <version>2.16.1</version>
     <packaging>jar</packaging>
     <name>xresloader</name>
 
@@ -249,24 +249,24 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>4.27.0</version>
+            <version>4.27.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>4.27.0</version>
+            <version>4.27.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>5.2.5</version>
+            <version>5.3.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>5.2.5</version>
+            <version>5.3.0</version>
         </dependency>
 
         <dependency>

diff --git 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<String> name_list
         for (Descriptors.FieldDescriptor fd : desc.getFields()) {
             DataDstChildrenNode child = null;
             ArrayList<String> 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)) {