Skip to content

Commit

Permalink
discarded code that will never be reached
Browse files Browse the repository at this point in the history
  • Loading branch information
ffritze committed Feb 4, 2025
1 parent 6be4f20 commit e294399
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
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

0 comments on commit e294399

Please sign in to comment.