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

4828 - handle pre-registering providers when creating file pids #4830

Conversation

qqmyers
Copy link
Member

@qqmyers qqmyers commented Jul 10, 2018

Related Issues

Pull Request Checklist

@qqmyers
Copy link
Member Author

qqmyers commented Jul 10, 2018

Apologies for the whitespace changes - the real change is just to set the identifier as registered and update the date prior to calling publicizeIdentifier for those providers that pre-register in two places - the first handling the files (which I've ~tested) and again in the file loop for datasets (which I haven't looked into).

@coveralls
Copy link

coveralls commented Jul 10, 2018

Coverage Status

Coverage decreased (-0.003%) to 15.44% when pulling 4d45d2d on QualitativeDataRepository:4828-DOI_registration_with_EZID_does_not_make_DOIs_public into 68b535c on IQSS:develop.

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

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

I'm sorry to do this but can you please either fix up this pull request or make a new one that doesn't have all the whitespace changes?

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

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

Please resolve the merge conflicts.

4828-DOI_registration_with_EZID_does_not_make_DOIs_public

Conflicts:
	src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java
Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

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

Thanks for resolving the merge conflicts!

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

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

I'm not very familiar with this part of the code base but I left a comment about a null check.

// publicizeIdentifier is called
target.setIdentifierRegistered(true);
target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
}
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason why the if block above is not within the doiRetString != null null check below?

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm - no. Just has to happen before publicizeIdentifier is called and shouldn't happen if the doiRetString is null/doesn't match. Good catch. I'll change that and do the same in the files loop.

Copy link
Contributor

@matthew-a-dunlap matthew-a-dunlap left a comment

Choose a reason for hiding this comment

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

Aside from Phil's note about moving the new logic inside the "null checks", the logic checks out to me. Aside from that I feel it is good to go.

of https://github.com/QualitativeDataRepository/dataverse.git into
4828-DOI_registration_with_EZID_does_not_make_DOIs_public

Conflicts:
	src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java
@sekmiller
Copy link
Contributor

Agree with Matthew. I think this is ready for QA.

IdServiceBean did - loading the SettingsServiceBean.Key.Protocol if the
protocol parameter was null. See Issue 4828 discussion.
@kcondon kcondon merged commit db89320 into IQSS:develop Aug 3, 2018
@pdurbin pdurbin added this to the 4.9.2 - Stata Upgrades, etc. milestone Aug 9, 2018
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.

6 participants