forked from IQSS/dataverse
-
Notifications
You must be signed in to change notification settings - Fork 5
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
replaced ZipInputStream in CreateNewDataFilesCommand #199
Open
jo-pol
wants to merge
20
commits into
DANS-KNAW:v6.2-DANS-DataStation
Choose a base branch
from
DANS-KNAW-jp:DD-1576-zips-on-v6.2-patch6
base: v6.2-DANS-DataStation
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
replaced ZipInputStream in CreateNewDataFilesCommand #199
jo-pol
wants to merge
20
commits into
DANS-KNAW:v6.2-DANS-DataStation
from
DANS-KNAW-jp:DD-1576-zips-on-v6.2-patch6
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
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.
Why we need this PR:
Zips created by downloading multiple files from an ownCloud service throws
java.util.zip.ZipException: only DEFLATED entries can have EXT descriptor
when usingZipInputStream
to iterate over the entries. This causes the zipfiles to be ingested as is. WithZipFile
we don't encounter the exception.What this PR does:
Replaces ZipInputStream with ZipFile.
Additional
CreateNewDataFilesCommand
: extracted methodsfilteredZipEntries
,openZipFile
,getShortName
andisNotFakeFile
CreateNewDataFilesCommand
or should I call it an integragtion test for the changed classes.FileUtil.determineFileType
catches Bag exceptions The method will now returnapplication/zip
rather than throw. Without catching I would need complex mocking to get a BagitFileHandler via CDI just to test the rest.Which issue(s) this PR closes:
Closes #
Special notes for your reviewer:
Reduce differnces by a compare ignoring white space:
https://github.com/DANS-KNAW/dataverse/pull/199/files?w=1
Suggestions on how to test this:
Upload the zips in
src/test/resources/own-cloud-downloads/
Failed to unzip the file. Saving the file as is.
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?:
Zips downloaded from an ownCloud service are no longer uploaded as is but unzipped.
Additional documentation:
Screenshots of result before and after deploy