From dfcaf3c43b316d3e03fece50cd7b14ec0f0f09c2 Mon Sep 17 00:00:00 2001
From: owent <>
Date: Mon, 28 Oct 2024 14:24:53 +0800
Subject: [PATCH 1/2] v2.19.2

---
 HISTORY.md                                        | 3 +++
 pom.xml                                           | 4 ++--
 src/org/xresloader/core/data/dst/DataDstJava.java | 6 +++++-
 src/org/xresloader/core/data/dst/DataDstPb.java   | 6 +++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 15dae3ea..8971e7a4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -5,6 +5,9 @@
 ## 2.19.2
 
 1. 修复 `--data-source-mapping-file` 指向的地址无效时的 stacktrace 。
+2. 优化Warning的输出数据源
+3. 更新依赖库
+   + `com.google.protobuf` -> 4.28.3
 
 ## 2.19.1
 
diff --git a/pom.xml b/pom.xml
index 47729561..ab7dcdba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,12 +243,12 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>4.28.2</version>
+            <version>4.28.3</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>4.28.0</version>
+            <version>4.28.3</version>
         </dependency>
 
         <dependency>
diff --git a/src/org/xresloader/core/data/dst/DataDstJava.java b/src/org/xresloader/core/data/dst/DataDstJava.java
index aacd52c3..10f82e1e 100644
--- a/src/org/xresloader/core/data/dst/DataDstJava.java
+++ b/src/org/xresloader/core/data/dst/DataDstJava.java
@@ -1360,9 +1360,13 @@ && dumpPlainField(ret.value, field.getTypeDescriptor(), null, children.get(i), n
 
         if (!missingFields.isEmpty()) {
             String message = String.format(
-                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > Missing fields: %s",
+                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > File: %s, Table: %s, Row: %d, Column: %d(%s)%s  > Missing fields: %s",
                     field.getTypeDescriptor().getFullName(), atLeastFieldSize, fieldSize, inputs.length,
                     ProgramOptions.getEndl(),
+                    rowContext.fileName, rowContext.tableName,
+                    rowContext.row + 1, DataSrcImpl.getOurInstance().getLastColomnNum() + 1,
+                    ExcelEngine.getColumnName(DataSrcImpl.getOurInstance().getLastColomnNum() + 1),
+                    ProgramOptions.getEndl(),
                     String.join(",", missingFields.values().stream().map(DataDstFieldDescriptor::getName)
                             .collect(Collectors.toList())));
             ProgramOptions.getLoger().warn(message);
diff --git a/src/org/xresloader/core/data/dst/DataDstPb.java b/src/org/xresloader/core/data/dst/DataDstPb.java
index 262e7ad9..66a6a23a 100644
--- a/src/org/xresloader/core/data/dst/DataDstPb.java
+++ b/src/org/xresloader/core/data/dst/DataDstPb.java
@@ -3059,9 +3059,13 @@ && dumpPlainField(builder, null, child, null, inputs[usedInputIdx], rowContext,
 
         if (!missingFields.isEmpty()) {
             String message = String.format(
-                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > Missing fields: %s",
+                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > File: %s, Table: %s, Row: %d, Column: %d(%s)%s  > Missing fields: %s",
                     field.getTypeDescriptor().getFullName(), atLeastFieldSize, fieldSize, inputs.length,
                     ProgramOptions.getEndl(),
+                    rowContext.fileName, rowContext.tableName,
+                    rowContext.row + 1, DataSrcImpl.getOurInstance().getLastColomnNum() + 1,
+                    ExcelEngine.getColumnName(DataSrcImpl.getOurInstance().getLastColomnNum() + 1),
+                    ProgramOptions.getEndl(),
                     String.join(",", missingFields.values().stream().map(DataDstFieldDescriptor::getName)
                             .collect(Collectors.toList())));
             ProgramOptions.getLoger().warn(message);

From 100a372754dfeffa4d087be20d68fb3c85ee8b1b Mon Sep 17 00:00:00 2001
From: owent <>
Date: Mon, 28 Oct 2024 15:02:31 +0800
Subject: [PATCH 2/2] 2.19.3

---
 HISTORY.md | 10 +++++++---
 pom.xml    |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 8971e7a4..4e63eb62 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,12 +2,16 @@
 
 ## Unrelease
 
+### 2.19.3
+
+1. 优化Warning的输出数据源
+2. 更新依赖库
+   + `com.google.protobuf` -> 4.28.3
+
 ## 2.19.2
 
 1. 修复 `--data-source-mapping-file` 指向的地址无效时的 stacktrace 。
-2. 优化Warning的输出数据源
-3. 更新依赖库
-   + `com.google.protobuf` -> 4.28.3
+
 
 ## 2.19.1
 
diff --git a/pom.xml b/pom.xml
index ab7dcdba..d1864589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.xresloader</groupId>
     <artifactId>xresloader</artifactId>
-    <version>2.19.2</version>
+    <version>2.19.3</version>
     <packaging>jar</packaging>
     <name>xresloader</name>