Skip to content

Commit af96f83

Browse files
stevenwinshippdurbin
authored andcommitted
address review comments
1 parent 2b378f2 commit af96f83

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
@@ -37,7 +37,7 @@
3737
import jakarta.inject.Named;
3838
import jakarta.persistence.*;
3939
import jakarta.persistence.criteria.*;
40-
import org.jsoup.internal.StringUtil;
40+
import org.apache.commons.lang3.StringUtils;
4141

4242
/**
4343
*
@@ -282,13 +282,12 @@ public List<FileMetadata> findFileMetadataByDatasetVersionId(Long datasetVersion
282282

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

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

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

0 commit comments

Comments
 (0)