fix: read encrypted xlsx file exception #394
Merged
+113
−78
Conversation
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
delei
commented
Jun 24, 2025
fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataTest.java
Show resolved
Hide resolved
alaahong
reviewed
Jun 26, 2025
fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataTest.java
Show resolved
Hide resolved
fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataTest.java
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR enhances Excel type detection for password-protected files and refactors the encryption-related test cases to support XLSX, XLS, and CSV in both file and stream modes.
- Enhanced
ExcelTypeEnum.valueOfto recognize file type before and after password checks. - Refactored
EncryptDataTestto parameterize read/write scenarios across XLSX, XLS, and CSV. - Updated test listener and model to use Lombok logging and consistent data naming.
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataTest.java | Refactored and parameterized encryption tests to support XLSX, XLS, and CSV with streaming options |
| fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataListener.java | Added logging with Lombok’s @Slf4j and updated assertions in data listener |
| fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptData.java | Added @ToString to test data model |
| fastexcel-core/src/main/java/cn/idev/excel/support/ExcelTypeEnum.java | Enhanced ExcelTypeEnum recognition to handle password-protected files |
Comments suppressed due to low confidence (1)
fastexcel-core/src/main/java/cn/idev/excel/support/ExcelTypeEnum.java:55
StringUtilsis not imported; add the appropriate import (e.g.,import cn.idev.excel.util.StringUtils;) to avoid compilation errors.
boolean hasPassword = !StringUtils.isEmpty(readWorkbook.getPassword());
fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataTest.java
Show resolved
Hide resolved
fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataTest.java
Show resolved
Hide resolved
fastexcel-test/src/test/java/cn/idev/excel/test/core/encrypt/EncryptDataListener.java
Outdated
Show resolved
Hide resolved
psxjoy
approved these changes
Jul 11, 2025
Member
psxjoy
left a comment
There was a problem hiding this comment.
+LGTM
If no one else has a problem with it, I'll merge it into the main branch this week :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Close #393
What's changed?
Checklist