-
Notifications
You must be signed in to change notification settings - Fork 485
fix: support immutable lists in dynamic header #668
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bengbengbalabalabeng
wants to merge
13
commits into
apache:main
Choose a base branch
from
bengbengbalabalabeng:fix-issue-665
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
2604790
fix: support immutable lists in dynamic header
bengbengbalabalabeng bf9c0d9
test: update test based on review feedback.
bengbengbalabalabeng 2e0e49b
Merge branch 'main' into fix-issue-665
alaahong 597ffec
Merge branch 'main' into fix-issue-665
bengbengbalabalabeng 3e73c38
refactor: replace stream implementation with explicit loop, and updat…
bengbengbalabalabeng ff7d622
chore: remove unnecessary imports.
bengbengbalabalabeng 96f8eff
Merge branch 'main' into fix-issue-665
alaahong 3f6c26c
Merge branch 'main' into fix-issue-665
psxjoy c7f79c7
Merge branch 'main' into fix-issue-665
bengbengbalabalabeng c5a4991
Merge branch 'main' into fix-issue-665
bengbengbalabalabeng 21f77eb
Merge branch 'main' into fix-issue-665
bengbengbalabalabeng 3ae3cf7
Merge branch 'main' into fix-issue-665
bengbengbalabalabeng 67f502e
Merge branch 'main' into fix-issue-665
bengbengbalabalabeng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
fesod/src/test/java/org/apache/fesod/excel/head/ImmutableListHeadDataListener.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.excel.head; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.fesod.excel.context.AnalysisContext; | ||
| import org.apache.fesod.excel.metadata.data.ReadCellData; | ||
| import org.apache.fesod.excel.read.listener.ReadListener; | ||
| import org.junit.jupiter.api.Assertions; | ||
|
|
||
| public class ImmutableListHeadDataListener implements ReadListener<Map<Integer, String>> { | ||
|
|
||
| private List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>(); | ||
|
|
||
| @Override | ||
| public void invokeHead(Map<Integer, ReadCellData<?>> headMap, AnalysisContext context) { | ||
| Assertions.assertNotNull(context.readRowHolder().getRowIndex()); | ||
| headMap.forEach((key, value) -> { | ||
| Assertions.assertEquals(value.getRowIndex(), context.readRowHolder().getRowIndex()); | ||
| Assertions.assertEquals(value.getColumnIndex(), key); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void invoke(Map<Integer, String> data, AnalysisContext context) { | ||
| list.add(data); | ||
| } | ||
|
|
||
| @Override | ||
| public void doAfterAllAnalysed(AnalysisContext context) { | ||
| List<List<String>> head = context.readSheetHolder().getHead(); | ||
|
|
||
| Assertions.assertInstanceOf(ArrayList.class, head); | ||
| for (List<String> item : head) { | ||
| Assertions.assertInstanceOf(ArrayList.class, item); | ||
| } | ||
|
|
||
| Assertions.assertEquals(1, list.size()); | ||
| Map<Integer, String> data = list.get(0); | ||
| Assertions.assertEquals("字符串0", data.get(0)); | ||
| Assertions.assertEquals("1", data.get(1)); | ||
| Assertions.assertEquals("2025-10-31 01:01:01", data.get(2)); | ||
| Assertions.assertEquals("额外数据", data.get(3)); | ||
| } | ||
| } | ||
95 changes: 95 additions & 0 deletions
95
fesod/src/test/java/org/apache/fesod/excel/head/ImmutableListHeadDataTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.excel.head; | ||
|
|
||
| import java.io.File; | ||
| import java.text.ParseException; | ||
| import java.util.*; | ||
|
||
| import org.apache.fesod.excel.FastExcel; | ||
| import org.apache.fesod.excel.util.DateUtils; | ||
| import org.apache.fesod.excel.util.TestFileUtil; | ||
| import org.junit.jupiter.api.*; | ||
|
|
||
| @TestMethodOrder(MethodOrderer.MethodName.class) | ||
| public class ImmutableListHeadDataTest { | ||
|
|
||
| private static File file07; | ||
| private static File file03; | ||
| private static File fileCsv; | ||
|
|
||
| @BeforeAll | ||
| public static void init() { | ||
| file07 = TestFileUtil.createNewFile("listHead07.xlsx"); | ||
| file03 = TestFileUtil.createNewFile("listHead03.xls"); | ||
| fileCsv = TestFileUtil.createNewFile("listHeadCsv.csv"); | ||
| } | ||
|
|
||
| @Test | ||
| public void t01ReadAndWrite07() throws Exception { | ||
| readAndWrite(file07); | ||
| } | ||
|
|
||
| @Test | ||
| public void t02ReadAndWrite03() throws Exception { | ||
| readAndWrite(file03); | ||
| } | ||
|
|
||
| @Test | ||
| public void t03ReadAndWriteCsv() throws Exception { | ||
| readAndWrite(fileCsv); | ||
| } | ||
|
|
||
| private void readAndWrite(File file) throws Exception { | ||
| FastExcel.write(file) | ||
| .head(head()) | ||
| .registerWriteHandler(new ImmutableListHeadDataWriteHandler()) | ||
| .sheet() | ||
| .doWrite(data()); | ||
|
|
||
| FastExcel.read(file) | ||
| .head(head()) | ||
| .registerReadListener(new ImmutableListHeadDataListener()) | ||
| .sheet() | ||
| .doRead(); | ||
| } | ||
|
|
||
| private List<List<String>> head() { | ||
| List<List<String>> list = new ArrayList<List<String>>(); | ||
| List<String> head0 = Arrays.asList("字符串"); | ||
| List<String> head1 = new ArrayList<String>(); | ||
| head1.add("数字"); | ||
|
|
||
| list.add(head0); | ||
| list.add(Collections.unmodifiableList(head1)); | ||
| list.add(Collections.singletonList("日期")); | ||
| return list; | ||
| } | ||
|
|
||
| private List<List<Object>> data() throws ParseException { | ||
| List<List<Object>> list = new ArrayList<List<Object>>(); | ||
| List<Object> data0 = new ArrayList<Object>(); | ||
| data0.add("字符串0"); | ||
| data0.add(1); | ||
| data0.add(DateUtils.parseDate("2025-10-31 01:01:01")); | ||
| data0.add("额外数据"); | ||
| list.add(data0); | ||
| return list; | ||
| } | ||
| } | ||
39 changes: 39 additions & 0 deletions
39
fesod/src/test/java/org/apache/fesod/excel/head/ImmutableListHeadDataWriteHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.excel.head; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import org.apache.fesod.excel.write.handler.SheetWriteHandler; | ||
| import org.apache.fesod.excel.write.handler.context.SheetWriteHandlerContext; | ||
| import org.junit.jupiter.api.Assertions; | ||
|
|
||
| public class ImmutableListHeadDataWriteHandler implements SheetWriteHandler { | ||
|
|
||
| @Override | ||
| public void afterSheetDispose(SheetWriteHandlerContext context) { | ||
| List<List<String>> head = context.getWriteContext().writeSheetHolder().getHead(); | ||
|
|
||
| Assertions.assertInstanceOf(ArrayList.class, head); | ||
| for (List<String> item : head) { | ||
| Assertions.assertInstanceOf(ArrayList.class, item); | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is best to use English.