Skip to content

refactor UpdateDatasetLicenseCommand to extend AbstractDatasetCommand<Dataset> #11958

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
scolapasta merged 6 commits into from
Nov 20, 2025
Merged

refactor UpdateDatasetLicenseCommand to extend AbstractDatasetCommand<Dataset> #11958

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cafee37
refactor base command
stevenwinship Nov 5, 2025
a496333
Merge branch 'develop' into 11771-fix-npe-in-update-licenses
stevenwinship Nov 5, 2025
c2a90ef
Merge branch 'develop' into 11771-fix-npe-in-update-licenses
stevenwinship Nov 7, 2025
46bbf35
Merge branch 'develop' into 11771-fix-npe-in-update-licenses
stevenwinship Nov 10, 2025
990c07e
Merge branch 'develop' into 11771-fix-npe-in-update-licenses
stevenwinship Nov 12, 2025
2a66575
Merge branch 'develop' into 11771-fix-npe-in-update-licenses
stevenwinship Nov 13, 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
15 changes: 7 additions & 8 deletions src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetLicenseCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,26 @@
import java.util.List;

@RequiredPermissions(Permission.EditDataset)
public class UpdateDatasetLicenseCommand extends AbstractVoidCommand {
private final Dataset dataset;
public class UpdateDatasetLicenseCommand extends AbstractDatasetCommand<Dataset> {
private License license = null;
private TermsOfUseAndAccess customTermsOfUseAndAccess = null;

public UpdateDatasetLicenseCommand(DataverseRequest aRequest, Dataset dataset, License license) {
super(aRequest, dataset);
this.dataset = dataset;
this.license = license;
}

public UpdateDatasetLicenseCommand(DataverseRequest aRequest, Dataset dataset, TermsOfUseAndAccess customTermsOfUseAndAccess) {
super(aRequest, dataset);
this.dataset = dataset;
this.customTermsOfUseAndAccess = customTermsOfUseAndAccess;
}


@Override
protected void executeImpl(CommandContext ctxt) throws CommandException {
DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
public Dataset execute(CommandContext ctxt) throws CommandException {
DatasetVersion datasetVersion = getDataset().getOrCreateEditVersion();
datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
Dataset savedDataset = null;

if (license != null) {
if (!license.isActive()) {
Expand All @@ -43,7 +41,7 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
TermsOfUseAndAccess termsOfUseAndAccess = datasetVersion.getTermsOfUseAndAccess();
termsOfUseAndAccess.setLicense(license);

ctxt.engine().submit(new UpdateDatasetVersionCommand(this.dataset, getRequest()));
savedDataset = ctxt.engine().submit(new UpdateDatasetVersionCommand(getDataset(), getRequest()));
} else if (customTermsOfUseAndAccess != null) {
if (customTermsOfUseAndAccess.getTermsOfUse() == null || customTermsOfUseAndAccess.getTermsOfUse().isBlank()) {
throw new InvalidCommandArgumentsException(BundleUtil.getStringFromBundle("updateDatasetLicenseCommand.errors.customTermsOfUseNotProvided"), this);
Expand All @@ -52,8 +50,9 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
applyCustomTerms(termsToUpdate, customTermsOfUseAndAccess);
termsToUpdate.setLicense(null);
datasetVersion.setTermsOfUseAndAccess(termsToUpdate);
ctxt.engine().submit(new UpdateDatasetVersionCommand(this.dataset, getRequest()));
savedDataset = ctxt.engine().submit(new UpdateDatasetVersionCommand(getDataset(), getRequest()));
}
return savedDataset;
}

/**
Expand Down