Skip to content

reverted last commit #3319

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
lbownik merged 1 commit into from
Jun 26, 2026
Merged

reverted last commit #3319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 11 additions & 29 deletions ...pp/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
package edu.harvard.iq.dataverse.engine.command.impl;

import static java.util.stream.Collectors.joining;

import java.sql.Timestamp;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.validation.ConstraintViolation;

import edu.harvard.iq.dataverse.common.BundleUtil;
import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
import edu.harvard.iq.dataverse.engine.command.CommandContext;
Expand All @@ -24,7 +11,6 @@
import edu.harvard.iq.dataverse.globalid.FakePidProviderServiceBean;
import edu.harvard.iq.dataverse.globalid.GlobalIdServiceBean;
import edu.harvard.iq.dataverse.persistence.datafile.FileMetadata;
import edu.harvard.iq.dataverse.persistence.dataset.ControlledVocabularyValue;
import edu.harvard.iq.dataverse.persistence.dataset.Dataset;
import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldUtil;
Expand All @@ -36,6 +22,17 @@
import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
import io.vavr.control.Try;

import javax.validation.ConstraintViolation;
import java.sql.Timestamp;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;

import static java.util.stream.Collectors.joining;

/**
* Base class for commands that deal with {@code Dataset}s.Mainly here as a code
* re-use mechanism.
Expand Down Expand Up @@ -145,13 +142,10 @@ protected void validateOrDie(DatasetVersion dsv, Boolean lenient, CommandContext
*/
protected void tidyUpFields(DatasetVersion dsv) {
removeBlankDatasetFields(dsv.getDatasetFields());

removeControlledVocabularyDuplicates(dsv.getDatasetFields());

updateDisplayOrder(dsv.getDatasetFields());

dsv.getDatasetFields().forEach(field -> field.trimTrailingSpaces());

}

/**
Expand Down Expand Up @@ -280,16 +274,4 @@ private void handlePidReservation(Dataset theDataset, GlobalIdServiceBean global
theDataset.setIdentifierRegistered(true);
}
}

/* In theory this function shouldn't be needed but */
private void removeControlledVocabularyDuplicates(final List<DatasetField> fields) {

final HashSet<ControlledVocabularyValue> alreadySeen = new HashSet<>();
for(final DatasetField field : fields) {
field.getControlledVocabularyValues().
removeIf(value -> !alreadySeen.add(value));
alreadySeen.clear();
removeControlledVocabularyDuplicates(field.getChildren());
}
}
}
Loading