fix: fix error in using relativeHeadRowIndex for writing tables only by 32154678925 · Pull Request #810 · apache/fesod

32154678925 · 2026-01-18T06:48:15Z

Purpose of the pull request

Closed: #794
When you do not write directly in the sheet, but only write data in the table and set the head, the offset value set with relativeHeadRowIndex() will make an error, and the blank line with the specified offset will be empty again between the head and the data. If the head is not set, the offset value set with relativeHeadRowIndex() will not take effect

What's changed?

Change the judgment of whether to add offset in the add method in the ExcelWriteAddExecutor class from writeSheetHolder to currentWriteHolder

Before:

WriteSheetHolder writeSheetHolder = writeContext.writeSheetHolder();
int newRowIndex = writeSheetHolder.getNewRowIndexAndStartDoWrite();
if (writeSheetHolder.isNew()
        && !writeSheetHolder.getExcelWriteHeadProperty().hasHead()) {
    newRowIndex += writeContext.currentWriteHolder().relativeHeadRowIndex();
}

After:

WriteSheetHolder writeSheetHolder = writeContext.writeSheetHolder();
WriteHolder currentWriteHolder = writeContext.currentWriteHolder();
int newRowIndex = writeSheetHolder.getNewRowIndexAndStartDoWrite();
if (currentWriteHolder.isNew()) {
    AbstractWriteHolder writeHolder = (AbstractWriteHolder) currentWriteHolder;
    if(!writeHolder.getExcelWriteHeadProperty().hasHead()){
        newRowIndex += currentWriteHolder.relativeHeadRowIndex();
    }
}

Checklist

I have read the Contributor Guide.
I have written the necessary doc or comment.
I have added the necessary unit tests and all cases have passed.

…pache#794)

…pache#794) Modify code format

Copilot

Pull request overview

This pull request fixes a bug where relativeHeadRowIndex() was being applied twice when writing data to tables with headers, causing extra blank rows to appear between the header and data. The fix changes the condition from checking whether the sheet is new to checking whether the current write holder (which could be a table) is new and has no head.

Changes:

Modified logic in ExcelWriteAddExecutor.add() to check currentWriteHolder instead of writeSheetHolder for applying the row index offset
Added import for AbstractWriteHolder class
Added instanceof check before casting to AbstractWriteHolder (unnecessary based on codebase architecture)

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-21T06:59:58Z

+            if (currentWriteHolder instanceof AbstractWriteHolder) {
+                AbstractWriteHolder writeHolder = (AbstractWriteHolder) currentWriteHolder;
+                if (!writeHolder.getExcelWriteHeadProperty().hasHead()) {
+                    newRowIndex += currentWriteHolder.relativeHeadRowIndex();
+                }


The instanceof check for AbstractWriteHolder is unnecessary. All implementations of WriteHolder (WriteSheetHolder, WriteTableHolder, WriteWorkbookHolder) extend AbstractWriteHolder. The rest of the codebase directly casts currentWriteHolder() to AbstractWriteHolder without instanceof checks (see WriteHandlerUtils.java lines 79, 124, 160, 168, 176, 184). For consistency with the existing codebase patterns, the cast should be done directly without the instanceof check.

Suggested change

if (currentWriteHolder instanceof AbstractWriteHolder) {

AbstractWriteHolder writeHolder = (AbstractWriteHolder) currentWriteHolder;

if (!writeHolder.getExcelWriteHeadProperty().hasHead()) {

newRowIndex += currentWriteHolder.relativeHeadRowIndex();

}

AbstractWriteHolder writeHolder = (AbstractWriteHolder) currentWriteHolder;

if (!writeHolder.getExcelWriteHeadProperty().hasHead()) {

newRowIndex += currentWriteHolder.relativeHeadRowIndex();

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

bengbengbalabalabeng · 2026-05-21T12:14:19Z

These tests contain no assertions and therefore do not validate the fix. Please enhance them with assertions that check the actual output. (Also ensure that both XLSX and XLS formats are covered)

- Add read-back verification via WorkbookFactory for both test cases - Parameterize with @EnumSource to cover both .xls and .xlsx formats - Use randomized offsets (0–9) and data sizes (1–10) for broader coverage - Replace non-deterministic Random data with predictable prefix‑index pattern - Resolve header string from @ExcelProperty annotation via reflection to avoid coupling to a hardcoded value in WriteSheetData - Calculate expected sequential row layout (tables are sequential, not overlapping; B's position = A's last row + offsetB + 1) Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

32154678925 · 2026-06-07T07:27:59Z

这些测试不包含断言，因此不验证修复。请用检查实际输出的断言来增强它们。（同时确保涵盖XLSX和XLS格式）

谢谢，我修改了测试代码，并且成功跑通测试，且测试了未修改bug的代码，测试是跑不同的。我的代码经验不多，还有什么需要修改的么？

Thank you. I modified the test code and successfully ran through the test. I also tested the code without modifying the bug. The test runs differently. I don't have much code experience. Is there anything I need to change?

bengbengbalabalabeng · 2026-06-15T10:57:59Z

@@ -0,0 +1,247 @@
+package org.apache.fesod.sheet.writesheet;


Please supplement the copyright header. license-header.txt

bengbengbalabalabeng · 2026-06-15T10:58:44Z

+            value = ExcelTypeEnum.class,
+            names = {"XLS", "XLSX"})
+    public void testWriteTableWithTitle(ExcelTypeEnum excelType) throws Exception {
+        Random random = new Random();


Random numbers may lead to non-deterministic, it is recommended to use @MethodSource to provide N sets of representative boundary values for testing.

bengbengbalabalabeng · 2026-06-15T10:59:41Z

Suggest covering multi-sheet table writing scenarios.

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

32154678925 · 2026-06-23T14:33:19Z

Suggest covering multi-sheet table writing scenarios.

I added a copyright notice, removed random numbers, and added multiple sets of offsets. They now work properly. Is there anything else I need to modify?

bengbengbalabalabeng · 2026-06-24T02:17:07Z

+package org.apache.fesod.sheet.writesheet;
+
+import java.io.File;
+import java.util.*;


Avoid using import * (34 lines have the same issue)

Avoid using import * (34 lines have the same issue)

我已经修改了引入规则，还有其他需要注意的么？或者本项目有什么规则之类的说明？或许我可以去看看。

I have modified the import rules. Is there anything else I should pay attention to? Or what are the rules of this project? Maybe I can go and have a look.

The unit tests for the fesod-sheet module have recently undergone systematic refactoring, and the original TestFileUtil has been completely removed. It is recommended to refer to the following latest test case examples:

org.apache.fesod.sheet.sheet.WriteSheetTest
org.apache.fesod.sheet.sheet.HiddenSheetsTest
......

I remove import TestFileUtil

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

32154678925 and others added 3 commits January 18, 2026 14:32

fix: fix error in using relativeHeadRowIndex for writing tables only(a…

bce94fd

…pache#794)

fix: fix error in using relativeHeadRowIndex for writing tables only(a…

d4c9711

…pache#794) Modify code format

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

b557200

alaahong requested a review from Copilot February 21, 2026 06:56

Copilot started reviewing on behalf of alaahong February 21, 2026 06:56 View session

Copilot AI reviewed Feb 21, 2026

View reviewed changes

alaahong and others added 3 commits March 16, 2026 20:48

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

a3bf3a2

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

e1853e8

Modify style issues and add unit tests

bb22044

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

32154678925 added 3 commits June 7, 2026 15:16

test code format

c262f78

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

96b677d

bengbengbalabalabeng and others added 2 commits June 11, 2026 19:39

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

319d2a7

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

65bef47

bengbengbalabalabeng reviewed Jun 15, 2026

View reviewed changes

bengbengbalabalabeng added PR: first-time contributor first-time contributor PR: reviewing Currently under active review. labels Jun 16, 2026

32154678925 added 2 commits June 23, 2026 22:28

add copyright header and change test code.

9828283

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

6815ab6

bengbengbalabalabeng reviewed Jun 24, 2026

View reviewed changes

32154678925 and others added 3 commits June 24, 2026 12:06

Avoid using import *

8f0fa29

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

Merge branch 'main' into fix/fix-relativeHeadRowIndex-invalid-#794

f860000

remove import TestFileUtil

f9d2419

Signed-off-by: 苗泽楠 <anan_laolu@foxmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: fix error in using relativeHeadRowIndex for writing tables only#810

fix: fix error in using relativeHeadRowIndex for writing tables only#810
32154678925 wants to merge 16 commits into
apache:mainfrom
32154678925:fix/fix-relativeHeadRowIndex-invalid-#794

32154678925 commented Jan 18, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 21, 2026

Uh oh!

bengbengbalabalabeng commented May 21, 2026

Uh oh!

32154678925 commented Jun 7, 2026

Uh oh!

bengbengbalabalabeng Jun 15, 2026

Uh oh!

bengbengbalabalabeng Jun 15, 2026

Uh oh!

bengbengbalabalabeng commented Jun 15, 2026

Uh oh!

32154678925 commented Jun 23, 2026

Uh oh!

bengbengbalabalabeng Jun 24, 2026 •

edited

Loading

Uh oh!

32154678925 Jun 24, 2026

Uh oh!

bengbengbalabalabeng Jun 25, 2026

Uh oh!

32154678925 Jun 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

32154678925 commented Jan 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose of the pull request

What's changed?

Checklist

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 21, 2026

Choose a reason for hiding this comment

Uh oh!

bengbengbalabalabeng commented May 21, 2026

Uh oh!

32154678925 commented Jun 7, 2026

Uh oh!

bengbengbalabalabeng Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

bengbengbalabalabeng Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

bengbengbalabalabeng commented Jun 15, 2026

Uh oh!

32154678925 commented Jun 23, 2026

Uh oh!

bengbengbalabalabeng Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

32154678925 Jun 24, 2026

Choose a reason for hiding this comment

Uh oh!

bengbengbalabalabeng Jun 25, 2026

Choose a reason for hiding this comment

Uh oh!

32154678925 Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

32154678925 commented Jan 18, 2026 •

edited

Loading

bengbengbalabalabeng Jun 24, 2026 •

edited

Loading