-
Notifications
You must be signed in to change notification settings - Fork 2.8k
NIFI-14426: Add support for HSSF format in ExcelReader processor #9874
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
Conversation
Thanks @zhtk, can you rebase this pull request from the updated |
Yes, rebased @exceptionfactory |
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.
Thanks for working on this @zhtk. The general approach looks straightforward. Although there are potential memory implications for the older XLS format, this seems to be the best implementation strategy for now.
I noted one particular issue related to password handling for XLS files, and the lack of thread safety. As mentioned, I think the best option for now is to not support encrypted XLS, and let the read operation fail.
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
Show resolved
Hide resolved
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
Outdated
Show resolved
Hide resolved
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
Outdated
Show resolved
Hide resolved
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
Outdated
Show resolved
Hide resolved
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
Outdated
Show resolved
Hide resolved
After reading whole discussion I decided to remove type detection and to add
|
@zhtk From message below it seems you must rebase in order to resolve conflicts. |
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.
@zhtk great work so far. I had a few more suggestions.
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
Outdated
Show resolved
Hide resolved
...les/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/InputFileType.java
Outdated
Show resolved
Hide resolved
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
Show resolved
Hide resolved
...-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
Outdated
Show resolved
Hide resolved
...-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
Outdated
Show resolved
Hide resolved
...-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
Outdated
Show resolved
Hide resolved
@zhtk Can you please fix the conflicts you have locally and then push? |
TBH I don't see conflicts, github interface says: "No conflicts with base branch. Changes can be cleanly merged.", and local merge also was performed cleanly. To make sure everything is ok, I have rebased and squashed all commits on the branch, hope now it's okay |
...ndles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
Outdated
Show resolved
Hide resolved
Things look okay now with the force push. Thanks! |
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.
I noticed one more thing (hopefully the last :) )
...les/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/InputFileType.java
Outdated
Show resolved
Hide resolved
…ain/java/org/apache/nifi/excel/InputFileType.java Co-authored-by: dan-s1 <[email protected]>
@exceptionfactory I approve these changes. Is there anything else you see which needs changing? |
Thanks, I will follow up soon. |
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.
Thanks for bringing this to completion @zhtk, and thanks for the reviews along the way @dan-s1, the latest version looks good.
I was going to note that the displayName()
element on the property is not necessary, but I see that follows the other properties for now, so removing the displayName()
across the board can be handled separately.
+1 merging
I also thank you for reviews and for patience in getting these changes merged 🙇 |
Summary
NIFI-14426: Add support for HSSF format in ExcelReader processor
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000
NIFI-00000
Pull Request Formatting
main
branchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
mvn clean install -P contrib-check
Licensing
LICENSE
andNOTICE
filesDocumentation