From b0d9c663369f6c710c6d7be3c90df19bd4456404 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 1 Aug 2019 09:49:24 +0200 Subject: [PATCH] Need to revert the usage of streams, as EclipseLink 2.5 is broken. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=429992 As we are stuck on Glassfish 4.1 for now (see #4172, #4248 and #4260), we cannot simply upgrade. Meh. This reverts commit c80aeea33488dea2cedc8c8bbe359625ad5dfb88. --- .../java/edu/harvard/iq/dataverse/DatasetField.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java index f1b1c20214b..e42a183502e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java @@ -11,7 +11,6 @@ */ import java.io.Serializable; import java.util.*; -import java.util.stream.Collectors; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -209,11 +208,13 @@ public void setControlledVocabularyValues(List contro * @return List of matching vocabulary items (containing the query string in their l18n string) */ public Collection completeVocabulary(String query) { - String q = query.toLowerCase(); - return this.getDatasetFieldType().getControlledVocabularyValues() - .stream() - .filter(cvv -> cvv.getLocaleStrValue().toLowerCase().contains(q)) - .collect(Collectors.toList()); + Collection filtered = new ArrayList<>(); + for (ControlledVocabularyValue item : this.getDatasetFieldType().getControlledVocabularyValues()) { + if (item.getLocaleStrValue().toLowerCase().contains(query.toLowerCase())) { + filtered.add(item); + } + } + return filtered; } /**