Skip to content

11968 compare versions differences for license changes. #12095

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

Open
sekmiller wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

11968 compare versions differences for license changes. #12095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd641b5
#11968 add license to diff list
sekmiller Jan 16, 2026
0ab4864
#11968 add testing
sekmiller Jan 16, 2026
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
8 changes: 7 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,13 @@ private void getTermsDifferences() {
logger.warning("New version does not have TermsOfUseAndAccess");
newTerms = new TermsOfUseAndAccess();
}


//get license name or bundle val for none to test for differences
String originalLicenseName = originalTerms.getLicense() != null ? originalTerms.getLicense().getName() : BundleUtil.getStringFromBundle("license.none.chosen");
String newLicenseName = newTerms.getLicense() != null ? newTerms.getLicense().getName() : BundleUtil.getStringFromBundle("license.none.chosen");

checkAndAddToChangeList(originalLicenseName, newLicenseName,
BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.license"));
checkAndAddToChangeList(originalTerms.getTermsOfUse(), newTerms.getTermsOfUse(),
BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header"));
checkAndAddToChangeList(originalTerms.getConfidentialityDeclaration(), newTerms.getConfidentialityDeclaration(),
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/edu/harvard/iq/dataverse/DatasetVersionDifferenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ public void testDifferencing() {
"You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.",
URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"),
true, 1l);
License license2 = new License("CC BY 4.0",
"Share — copy and redistribute the material in any medium or format for any purpose, even commercially.",
URI.create("https://creativecommons.org/licenses/by/4.0/"), URI.create("/resources/images/cc0.png"),
true, 2l);
license.setDefault(true);
dataset.setProtocol("doi");
dataset.setAuthority("10.5072/FK2");
Expand All @@ -66,9 +70,12 @@ public void testDifferencing() {
datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
datasetVersion.setVersionNumber(1L);
datasetVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
datasetVersion.getTermsOfUseAndAccess().setLicense(license);
DatasetVersion datasetVersion2 = new DatasetVersion();
datasetVersion2.setDataset(dataset);
datasetVersion2.setVersionState(DatasetVersion.VersionState.DRAFT);
datasetVersion2.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
datasetVersion2.getTermsOfUseAndAccess().setLicense(license);

// Published version's two files
DataFile dataFile = new DataFile();
Expand Down Expand Up @@ -163,13 +170,15 @@ public void testDifferencing() {
// Set the published version's TermsOfUseAndAccess to a non-null value
TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
datasetVersion.setTermsOfUseAndAccess(termsOfUseAndAccess);
datasetVersion.getTermsOfUseAndAccess().setLicense(license);

compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);

// Set the draft version's TermsOfUseAndAccess to a non-null value

datasetVersion2.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
datasetVersion2.getTermsOfUseAndAccess().setLicense(license);

compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
Expand All @@ -194,6 +203,21 @@ public void testDifferencing() {

compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);

// Change License in Draft version

datasetVersion2.getTermsOfUseAndAccess().setLicense(license2);
datasetVersion2.getTermsOfUseAndAccess().setTermsOfUse("");
datasetVersion.getTermsOfUseAndAccess().setDisclaimer("");

String[] termField3 = new String[] {
BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.license"),
"CC0 1.0", "CC BY 4.0" };
changedTerms = new ArrayList<>();
changedTerms.add(termField3);

compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);

}

Expand Down