Skip to content

#11546 fix compare separator logic #11596

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.

Sign up for GitHub

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

Merged
ofahimIQSS merged 2 commits into from
Jun 30, 2025
+10 −2
Merged

#11546 fix compare separator logic #11596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b0e2c
#11546 fix compare separator logic
sekmiller Jun 26, 2025
21f69e3
Merge branch 'develop' into 11546-pid-separator
sekmiller Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/pidproviders/AbstractPidProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public DvObject generatePid(DvObject dvObject) {
+ ") doesn't match that of the provider, id: " + getId());
}
}
if (dvObject.getAuthority() == null) {
if (dvObject.getAuthority() == null) {
dvObject.setAuthority(getAuthority());
} else {
if (!dvObject.getAuthority().equals(getAuthority())) {
Expand All @@ -209,11 +209,19 @@ public DvObject generatePid(DvObject dvObject) {
if (dvObject.getSeparator() == null) {
dvObject.setSeparator(getSeparator());
} else {
if (!dvObject.getSeparator().equals(getSeparator())) {
//only check separator if identifier is not null because a null authority would be set above...
//SEK 06/26/25 #11546
if (dvObject.getIdentifier() != null
&& !dvObject.getSeparator().equals(getSeparator())) {
logger.warning("The separator of the DvObject (" + dvObject.getSeparator()
+ ") does not match the configured separator (" + getSeparator() + ")");
throw new IllegalArgumentException("The separator of the DvObject (" + dvObject.getSeparator()
+ ") doesn't match that of the provider, id: " + getId());
} else {
//we know it's not null so fill it if it's empty
if (dvObject.getSeparator().isEmpty()) {
dvObject.setSeparator(getSeparator());
}
}
}
if (dvObject.isInstanceofDataset()) {
Expand Down