replace ZipInputStream with ZipFile #10899
Open
Conversation
This file contains 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
qqmyers
reviewed
Oct 1, 2024
|
|
||
| if (!zipEntry.isDirectory()) { | ||
| try (var zipFile = openZipFile(tempFile, charset)) { | ||
| for (var entry : filteredZipEntries(zipFile)) { |
There was a problem hiding this comment.
Can you avoid re opening the zip and getting entries since you already have them from lines 319-320 (if you stay in the same try block)?
qqmyers
approved these changes
Oct 1, 2024
qqmyers
added
Size: 3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
It will no longer fail to upload individual files from a zip downloaded from an ownCloud service.
See issue for further details.
Which issue(s) this PR closes:
Closes #10898
Special notes for your reviewer:
You will get less differences when ignoring white space changes:
https://github.com/IQSS/dataverse/compare/develop...DANS-KNAW-jp:dataverse:10898-own-cloud-zips?w=1
Replaced ZipInputStream with ZipFile in:
Additional
CreateNewDataFilesCommand: extracted methodsfilteredZipEntries,openZipFile,getShortNameandisFileToSkipThe extracted code is slightly different from the ShapeFileHandler.isFileToSkip but changing behavior is beyond the scope of the issue.CreateNewDataFilesCommandor should I call it an integragtion test for the changed classes.FileUtil.determineFileTypecatches Bag exceptions The method will now returnapplication/ziprather than throw. Without catching I would need complex mocking to get a BagitFileHandler via CDI just to test the rest.Suggestions on how to test this:
see issue
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
No
Is there a release notes update needed for this change?:
Zip file downloaded from an own cloud service will no longer be ingested as-is.
Additional documentation: