Skip to content
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

discarded code that will never be reached #11211

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

discarded code that will never be reached #11211

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
13 changes: 0 additions & 13 deletions src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,6 @@ public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printO
: metadataBlock.getDatasetFieldTypes();
}

Set<DatasetFieldType> datasetFieldTypes = filterOutDuplicateDatasetFieldTypes(datasetFieldTypesList);

JsonObjectBuilder fieldsBuilder = Json.createObjectBuilder();

Predicate<DatasetFieldType> isNoChild = element -> element.isChild() == false;
Expand Down Expand Up @@ -693,17 +691,6 @@ public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printO
return jsonObjectBuilder;
}

// This will remove datasetFieldTypes that are in the list but also a child of another datasetFieldType in the list
// Prevents duplicate datasetFieldType information from being returned twice
// See: https://github.com/IQSS/dataverse/issues/10472
private static Set<DatasetFieldType> filterOutDuplicateDatasetFieldTypes(List<DatasetFieldType> datasetFieldTypesList) {
// making a copy of the list as to not damage the original when we remove items
List<DatasetFieldType> datasetFieldTypes = new ArrayList<>(datasetFieldTypesList);
// exclude/remove datasetFieldTypes if datasetFieldType exists as a child of another datasetFieldType
datasetFieldTypesList.forEach(dsft -> dsft.getChildDatasetFieldTypes().forEach(c -> datasetFieldTypes.remove(c)));
return new TreeSet<>(datasetFieldTypes);
}

public static JsonArrayBuilder jsonDatasetFieldTypes(List<DatasetFieldType> fields) {
JsonArrayBuilder fieldsJson = Json.createArrayBuilder();
for (DatasetFieldType field : fields) {
Expand Down