Skip to content

Required controlledVocabulary metadata marked as valid while empty #12345

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
stevenwinship wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Required controlledVocabulary metadata marked as valid while empty #12345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b831b72
Required controlledVocabulary metadata marked as valid while empty
stevenwinship Apr 21, 2026
7aa0deb
Remove unused import for ConstraintViolation in DatasetPage.java
ErykKul Apr 28, 2026
ccbf5f0
Refactor CVV validation logic in validateVersionMetadata method
ErykKul Apr 28, 2026
6542a4a
Fixed N/A cvoc values DB pollution
ErykKul May 22, 2026
fdf1ba4
Merge branch 'develop' into 11900-improved-cvoc-value-validation2
ErykKul May 22, 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
20 changes: 18 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,26 @@ public boolean isValid(DatasetField value, ConstraintValidatorContext context) {
}

// if value is not primitive or not empty
if (!dsfType.isPrimitive() || !StringUtils.isBlank(value.getValue())) {
// For controlled vocabulary fields, check that actual CV values are selected,
// not just that datasetFieldValues contains something (which might be an invalid N/A placeholder)
// See https://github.com/IQSS/dataverse/issues/11900
if (!dsfType.isPrimitive()) {
return true;
}


if (dsfType.isControlledVocabulary()) {
// For CV fields, check if there are actual controlled vocabulary values selected
if (value.getControlledVocabularyValues() != null && !value.getControlledVocabularyValues().isEmpty()) {
return true;
}
// If no CV values, fall through to required field check below
} else {
// For non-CV primitive fields, check if value is not blank
if (!StringUtils.isBlank(value.getValue())) {
return true;
}
}

if (value.isRequired()) {
String errorMessage = null;
DatasetFieldCompoundValue parent = value.getParentDatasetFieldCompoundValue();
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
import org.primefaces.event.FileUploadEvent;
import org.primefaces.model.file.UploadedFile;

import jakarta.validation.ConstraintViolation;
import java.util.Arrays;
import java.util.HashSet;
import jakarta.faces.model.SelectItem;
Expand Down Expand Up @@ -4039,8 +4038,8 @@ public String save() {
dataset.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
}
// Validate
Set<ConstraintViolation> constraintViolations = workingVersion.validate();
if (!constraintViolations.isEmpty()) {
workingVersion.validate(); // add validation messages to dataset fields
if (!workingVersion.isValid()) {
FacesContext.getCurrentInstance().validationFailed();
return "";
}
Expand Down
36 changes: 16 additions & 20 deletions src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,7 @@

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.harvard.iq.dataverse.Dataset;
import edu.harvard.iq.dataverse.DatasetField;
import edu.harvard.iq.dataverse.DatasetFieldConstant;
import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
import edu.harvard.iq.dataverse.DatasetFieldType;
import edu.harvard.iq.dataverse.DatasetFieldValue;
import edu.harvard.iq.dataverse.DatasetServiceBean;
import edu.harvard.iq.dataverse.DatasetVersion;
import edu.harvard.iq.dataverse.Dataverse;
import edu.harvard.iq.dataverse.DataverseContact;
import edu.harvard.iq.dataverse.DataverseServiceBean;
import edu.harvard.iq.dataverse.EjbDataverseEngine;
import edu.harvard.iq.dataverse.GlobalId;
import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
import edu.harvard.iq.dataverse.*;
import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
import edu.harvard.iq.dataverse.api.imports.ImportUtil.ImportType;
import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
Expand Down Expand Up @@ -768,13 +755,22 @@ private boolean validateVersionMetadata(DatasetVersion version, boolean sanitize
Object invalid = v.getRootBean();
String msg = "";
if (invalid instanceof DatasetField) {
DatasetField f = (DatasetField) invalid;
msg += "Missing required field: " + f.getDatasetFieldType().getDisplayName() + ";";
DatasetField f = (DatasetField) invalid;

msg += "Missing required field: " + f.getDatasetFieldType().getDisplayName() + ";";
if (sanitize) {
msg += " populated with '" + DatasetField.NA_VALUE + "'";
f.setSingleValue(DatasetField.NA_VALUE);
fixed = true;
if (f.getDatasetFieldType().isControlledVocabulary()) {
ControlledVocabularyValue naValue = datasetfieldService.findNAControlledVocabularyValue();
if (naValue != null) {
f.setControlledVocabularyValues(List.of(naValue));
msg += " populated with '" + DatasetField.NA_VALUE + "'";
fixed = true;
}
} else {
f.setSingleValue(DatasetField.NA_VALUE);
msg += " populated with '" + DatasetField.NA_VALUE + "'";
fixed = true;
}
}
} else if (invalid instanceof DatasetFieldValue) {
DatasetFieldValue fv = (DatasetFieldValue) invalid;
Expand Down
6 changes: 5 additions & 1 deletion 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
Expand Up @@ -110,10 +110,14 @@ protected void validateOrDie(DatasetVersion dsv, Boolean lenient) throws Command
Set<ConstraintViolation> constraintViolations = dsv.validate();
if (!constraintViolations.isEmpty()) {
if (lenient) {
// populate invalid fields with N/A
// populate invalid primitive fields with N/A
// Note: controlled vocabulary fields should NOT get N/A values in datasetfieldvalue,
// as this creates an inconsistent state where the CV field appears valid but is empty.
// See https://github.com/IQSS/dataverse/issues/11900
constraintViolations.stream()
.filter(cv -> cv.getRootBean() instanceof DatasetField)
.map(cv -> ((DatasetField) cv.getRootBean()))
.filter(f -> !f.getDatasetFieldType().isControlledVocabulary())
.forEach(f -> f.setSingleValue(DatasetField.NA_VALUE));

} else {
Expand Down