Skip to content

Commit 79a5926

Browse files
committed
address review comments
1 parent f7b54e0 commit 79a5926

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import jakarta.inject.Named;
4141
import jakarta.persistence.*;
4242
import jakarta.persistence.criteria.*;
43-
import org.jsoup.internal.StringUtil;
43+
import org.apache.commons.lang3.StringUtils;
4444

4545
/**
4646
*
@@ -285,13 +285,12 @@ public List<FileMetadata> findFileMetadataByDatasetVersionId(Long datasetVersion
285285

286286
public List<Long> findDataFileIdsByDatasetVersionIdLabelSearchTerm(Long datasetVersionId, String userSuppliedSearchTerm, String userSuppliedSortField, String userSuppliedSortOrder) {
287287
FileSortFieldAndOrder sortFieldAndOrder = new FileSortFieldAndOrder(userSuppliedSortField, userSuppliedSortOrder);
288-
String searchTerm = !StringUtil.isBlank(userSuppliedSearchTerm) ? "%"+userSuppliedSearchTerm.trim().toLowerCase()+"%" : null;
288+
String searchTerm = !StringUtils.isBlank(userSuppliedSearchTerm) ? "%"+userSuppliedSearchTerm.trim().toLowerCase()+"%" : null;
289289

290290
String selectClause = "select o.datafile_id from FileMetadata o where o.datasetversion_id = " + datasetVersionId;
291291
String searchClause = searchTerm != null ? " and (lower(o.label) like ? or lower(o.description) like ?)" : "";
292292
String orderByClause = " order by o." + sortFieldAndOrder.getSortField() + " " + sortFieldAndOrder.getSortOrder();
293293

294-
// NOTE: since datafile_id and datasetversion_id are indexes we can't use a TypedQuery
295294
Query query = em.createNativeQuery(selectClause + searchClause + orderByClause);
296295
if (searchTerm != null) {
297296
query.setParameter(1, searchTerm);

0 commit comments

Comments
 (0)