Skip to content
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

Fixed fetch issue #103

Closed
wants to merge 5 commits into from
Closed

Fixed fetch issue #103

wants to merge 5 commits into from

Conversation

ThomasJejkal
Copy link
Contributor

Fixed bagDataDir argument in PayloadWriterTest#testWritePayloadFilesMinusFetchFiles.
Disabled removal of BagitWarning.DIFFERENT_NORMALIZATION in BagLinterTest as it seems to be produced also under MacOS in the meantime (resolves #102)
Fixed PayloadWriter#getFetchPaths to resolve fetch file path against the bag data folder correctly (resolves #99)

…inusFetchFiles.

Disabled removal of BagitWarning.DIFFERENT_NORMALIZATION in BagLinterTest as it seems to be produced also under MacOS in the meantime (resolves #102)
Fixed PayloadWriter#getFetchPaths to resolve fetch file path against the bag data folder correctly (resolves #99)
@coveralls
Copy link

coveralls commented Jan 16, 2018

Coverage Status

Coverage remained the same at 96.947% when pulling 4d0834d on ThomasJejkal:fetch_fix into c863f0d on LibraryOfCongress:master.

@ThomasJejkal
Copy link
Contributor Author

Obviously, the MacOS build in travis-ci uses a different OS version where removing BagitWarning.DIFFERENT_NORMALIZATION (see #102) is still necessary.

… to allow travis build

Added MessageBundle_de_DE.properties for German localization
Fixed minor typos in MessageBundle.properties
@@ -200,7 +200,7 @@ writing_line_to_file=Writing line [{}] to [{}]

#for BagWriter.java
writing_payload_files=Writing payload files.
upsert_payload_oxum=Upserting payload-oxum.
upsert_payload_oxum=Inserting payload-oxum.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, upserting is correct. It stands for inserting or updating.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry and thanks for extending my English vocabulary. 👍

Copy link
Contributor

@johnscancella johnscancella Jan 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 . And thank you for catching all my english mistakes!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who are the intended audience for this message? If not, I'd be inclined to use something like “updating” since “upsert” is generally only familiar to people who work with databases a lot.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a DEBUG message, which I generally wrote for other programmers.

@coveralls
Copy link

coveralls commented Jan 17, 2018

Coverage Status

Coverage remained the same at 96.947% when pulling f4ec574 on ThomasJejkal:fetch_fix into c863f0d on LibraryOfCongress:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage remained the same at 96.947% when pulling f4ec574 on ThomasJejkal:fetch_fix into c863f0d on LibraryOfCongress:master.

Copy link
Contributor

@johnscancella johnscancella left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that you changed the spacing for tabs to be 4 spaces among other changes, please return the formatting to what it originally was. Thanks!

@johnscancella
Copy link
Contributor

Is there a reason you keep changing the spacing and other formatting changes?

@ThomasJejkal
Copy link
Contributor Author

Actually, I'm using the auto-indent feature of Netbeans and by default, Netbeans is using its formatting rules from the official Java Code Conventions saying e.g. that a tab has a size of 4 spaces. I've changed the tab size to 3 but obviously you are using 2, so I'll change, reformat and commit again.

@coveralls
Copy link

coveralls commented Jan 17, 2018

Coverage Status

Coverage remained the same at 96.947% when pulling 9695dad on ThomasJejkal:fetch_fix into c863f0d on LibraryOfCongress:master.

@coveralls
Copy link

coveralls commented Jan 17, 2018

Coverage Status

Coverage remained the same at 96.947% when pulling 0761353 on ThomasJejkal:fetch_fix into c863f0d on LibraryOfCongress:master.

@johnscancella
Copy link
Contributor

Ah ok, I am using eclipse. If I recall correctly you can import eclipse formatting? If so you are welcome to use my formatter (just rename to .xml): eclipse formater.xml.txt

It just makes it hard to review your actual changes since there is so much superfluous highlighting from the format changes.

@ThomasJejkal
Copy link
Contributor Author

I've now committed again using your configuration. I hope this helped.

@@ -20,134 +20,134 @@
import gov.loc.repository.bagit.util.PathUtils;

/**
* Part of the BagIt conformance suite.
* This checker checks for various problems related to the manifests in a bag.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as far as I can tell, this file only contains formatting changes, is that correct?

@@ -16,38 +16,39 @@
import gov.loc.repository.bagit.reader.MetadataReader;

/**
* Part of the BagIt conformance suite.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, this file only contains formatting changes, is that correct?

@@ -21,73 +21,80 @@
* Responsible for writing out the bag payload to the filesystem
*/
public final class PayloadWriter {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, this file only contains formatting changes, is that correct?

@@ -3,7 +3,6 @@
import java.io.File;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this file only contains formatting changes, is that correct?

@johnscancella
Copy link
Contributor

Hi @ThomasJejkal it looks like some of the formatting that changed is still there. Could you take another pass at it so only your logical changes show up? That way it will make it much easier for me to review. Thanks!

@coveralls
Copy link

coveralls commented Jan 17, 2018

Coverage Status

Coverage remained the same at 96.947% when pulling 7b2ce33 on ThomasJejkal:fetch_fix into c863f0d on LibraryOfCongress:master.

@ThomasJejkal
Copy link
Contributor Author

I've created a new pull request with a clean copy as fixing all the small inconsistencies between both formatting schemes, even when using the same configuration, seems too frustrating to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BagLinterTest fails under MacOs Fetch files not listed in payload manifest
4 participants