From 5ce75b689d208189d7ae6b68f68038b1b3cde206 Mon Sep 17 00:00:00 2001 From: agrpranjal07 Date: Wed, 2 Apr 2025 22:23:55 +0530 Subject: [PATCH 1/2] Add Commons Collections 4 to the provided set of libraries --- api/src/main/java/org/openmrs/api/context/Daemon.java | 2 +- .../java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java | 2 +- .../main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java | 2 +- .../java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java | 2 +- .../java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java | 2 +- .../java/org/openmrs/api/db/hibernate/HibernateUserDAO.java | 2 +- .../java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java | 2 +- .../openmrs/api/db/hibernate/ImmutableEntityInterceptor.java | 2 +- .../org/openmrs/api/db/hibernate/PatientSearchCriteria.java | 2 +- .../java/org/openmrs/api/handler/PatientDataUnvoidHandler.java | 2 +- .../java/org/openmrs/api/handler/PatientDataVoidHandler.java | 2 +- api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java | 2 +- .../main/java/org/openmrs/api/impl/EncounterServiceImpl.java | 2 +- api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java | 2 +- api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java | 2 +- .../openmrs/util/databasechange/ConceptValidatorChangeSet.java | 2 +- api/src/main/java/org/openmrs/validator/CohortValidator.java | 2 +- .../org/openmrs/validator/ConceptReferenceTermValidator.java | 2 +- api/src/main/java/org/openmrs/validator/ConceptValidator.java | 2 +- api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java | 2 +- api/src/test/java/org/openmrs/api/ConceptServiceTest.java | 2 +- api/src/test/java/org/openmrs/api/PatientServiceTest.java | 2 +- .../org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java | 2 +- .../org/openmrs/api/handler/PatientDataVoidHandlerTest.java | 2 +- .../main/java/org/openmrs/web/filter/update/UpdateFilter.java | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/api/src/main/java/org/openmrs/api/context/Daemon.java b/api/src/main/java/org/openmrs/api/context/Daemon.java index 16981a782118..61766d73e1f9 100644 --- a/api/src/main/java/org/openmrs/api/context/Daemon.java +++ b/api/src/main/java/org/openmrs/api/context/Daemon.java @@ -16,7 +16,7 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.openmrs.Role; import org.openmrs.User; import org.openmrs.api.APIAuthenticationException; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java index 756f252f9d03..e9a235e3ca55 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java index e0e86e07b08a..5112b951ef03 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java @@ -21,7 +21,7 @@ import javax.persistence.criteria.Root; import javax.persistence.criteria.Subquery; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.FlushMode; import org.hibernate.SQLQuery; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java index 64d4ead592cb..40faf2bca77c 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.regex.Pattern; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.Query; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java index a42717c3fb89..58f36f72a7fa 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java @@ -23,7 +23,7 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java index f28963bb0797..6b41724f4222 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java index 9f75a731b694..ffbdee04b53e 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.openmrs.Concept; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java b/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java index 3b55ca43c9cd..3714f92935f3 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java @@ -9,7 +9,7 @@ */ package org.openmrs.api.db.hibernate; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.hibernate.EmptyInterceptor; import org.hibernate.type.Type; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java b/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java index b8248c757940..8e0ad910efdb 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.SessionFactory; import org.openmrs.Encounter; diff --git a/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java b/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java index 0d1a7a4c039f..0ffc6e6f6fd5 100644 --- a/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java +++ b/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.openmrs.Encounter; import org.openmrs.Order; import org.openmrs.Patient; diff --git a/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java b/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java index caa19fb4921e..f695941abd97 100644 --- a/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java +++ b/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.openmrs.Encounter; import org.openmrs.Patient; import org.openmrs.User; diff --git a/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java index 14b67e6706ed..23464564064a 100644 --- a/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java @@ -25,7 +25,7 @@ import java.util.UUID; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.hibernate.Hibernate; diff --git a/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java index 89cfabc5ba47..6b20b00a16b5 100644 --- a/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.Cohort; import org.openmrs.Encounter; diff --git a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java index fc6df7606f33..82d392155810 100644 --- a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.openmrs.Address; import org.openmrs.Location; import org.openmrs.LocationAttribute; diff --git a/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java index 220452c1fa1b..5cc15c77f6f5 100644 --- a/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.OrderSet; import org.openmrs.OrderSetAttribute; diff --git a/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java b/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java index 50f7669fff59..e92dce96a187 100644 --- a/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java +++ b/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.set.ListOrderedSet; import org.apache.commons.lang3.StringUtils; diff --git a/api/src/main/java/org/openmrs/validator/CohortValidator.java b/api/src/main/java/org/openmrs/validator/CohortValidator.java index abdcb527cb00..d7f99fd503d1 100644 --- a/api/src/main/java/org/openmrs/validator/CohortValidator.java +++ b/api/src/main/java/org/openmrs/validator/CohortValidator.java @@ -11,7 +11,7 @@ import java.util.Collection; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.openmrs.Cohort; import org.openmrs.CohortMembership; import org.openmrs.Patient; diff --git a/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java b/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java index 33d15315f3e7..79dba0ede222 100644 --- a/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java +++ b/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java @@ -12,7 +12,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.openmrs.ConceptReferenceTerm; import org.openmrs.ConceptReferenceTermMap; import org.openmrs.annotation.Handler; diff --git a/api/src/main/java/org/openmrs/validator/ConceptValidator.java b/api/src/main/java/org/openmrs/validator/ConceptValidator.java index 857ee0273468..7e816d7217c3 100644 --- a/api/src/main/java/org/openmrs/validator/ConceptValidator.java +++ b/api/src/main/java/org/openmrs/validator/ConceptValidator.java @@ -14,7 +14,7 @@ import java.util.Locale; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.Concept; import org.openmrs.ConceptAnswer; diff --git a/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java b/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java index 44b00a9092d1..a38c18825987 100644 --- a/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java +++ b/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; import org.junit.jupiter.api.Test; import org.openmrs.api.APIException; diff --git a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java index 5aac3b26a90f..487d814583ff 100644 --- a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java +++ b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; import net.sf.ehcache.Ehcache; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.dbunit.dataset.IDataSet; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/org/openmrs/api/PatientServiceTest.java b/api/src/test/java/org/openmrs/api/PatientServiceTest.java index 45ef5c0ee78e..6b7b551f679e 100644 --- a/api/src/test/java/org/openmrs/api/PatientServiceTest.java +++ b/api/src/test/java/org/openmrs/api/PatientServiceTest.java @@ -41,7 +41,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java b/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java index b280a19eaf58..24d3fce11442 100644 --- a/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java +++ b/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.junit.jupiter.api.Test; import org.openmrs.Cohort; import org.openmrs.CohortMembership; diff --git a/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java b/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java index 1ac4e1901cd4..1ad11c3cdf31 100644 --- a/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java +++ b/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.junit.jupiter.api.Test; import org.openmrs.Cohort; import org.openmrs.CohortMembership; diff --git a/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java b/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java index bc6bd6789e1d..6b0359a3e0f4 100644 --- a/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java +++ b/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java @@ -11,7 +11,7 @@ import liquibase.changelog.ChangeSet; import liquibase.exception.LockException; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.liquibase.ChangeLogDetective; import org.openmrs.util.DatabaseUpdateException; From df565cf8443bb6a6dc80b6e127d1c2dd3339f346 Mon Sep 17 00:00:00 2001 From: agrpranjal07 Date: Wed, 2 Apr 2025 22:48:44 +0530 Subject: [PATCH 2/2] Add Commons Collections 4 to the provided set of libraries Bug Fixed --- api/src/main/java/org/openmrs/api/context/Daemon.java | 2 +- .../openmrs/api/db/hibernate/HibernateConceptDAO.java | 9 ++++++--- .../org/openmrs/api/db/hibernate/HibernateObsDAO.java | 2 +- .../openmrs/api/db/hibernate/HibernatePatientDAO.java | 2 +- .../openmrs/api/db/hibernate/HibernateProviderDAO.java | 2 +- .../org/openmrs/api/db/hibernate/HibernateUserDAO.java | 2 +- .../org/openmrs/api/db/hibernate/HibernateVisitDAO.java | 2 +- .../api/db/hibernate/ImmutableEntityInterceptor.java | 2 +- .../openmrs/api/db/hibernate/PatientSearchCriteria.java | 2 +- .../openmrs/api/handler/PatientDataUnvoidHandler.java | 2 +- .../org/openmrs/api/handler/PatientDataVoidHandler.java | 2 +- .../java/org/openmrs/api/impl/ConceptServiceImpl.java | 2 +- .../java/org/openmrs/api/impl/EncounterServiceImpl.java | 2 +- .../java/org/openmrs/api/impl/LocationServiceImpl.java | 2 +- .../java/org/openmrs/api/impl/OrderSetServiceImpl.java | 2 +- .../util/databasechange/ConceptValidatorChangeSet.java | 2 +- .../main/java/org/openmrs/validator/CohortValidator.java | 2 +- .../openmrs/validator/ConceptReferenceTermValidator.java | 2 +- .../java/org/openmrs/validator/ConceptValidator.java | 2 +- .../test/java/org/openmrs/OrderEntryIntegrationTest.java | 2 +- .../test/java/org/openmrs/api/ConceptServiceTest.java | 2 +- .../test/java/org/openmrs/api/PatientServiceTest.java | 2 +- .../api/handler/PatientDataUnvoidHandlerTest.java | 2 +- .../openmrs/api/handler/PatientDataVoidHandlerTest.java | 2 +- .../java/org/openmrs/web/filter/update/UpdateFilter.java | 2 +- 25 files changed, 30 insertions(+), 27 deletions(-) diff --git a/api/src/main/java/org/openmrs/api/context/Daemon.java b/api/src/main/java/org/openmrs/api/context/Daemon.java index 61766d73e1f9..16981a782118 100644 --- a/api/src/main/java/org/openmrs/api/context/Daemon.java +++ b/api/src/main/java/org/openmrs/api/context/Daemon.java @@ -16,7 +16,7 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.openmrs.Role; import org.openmrs.User; import org.openmrs.api.APIAuthenticationException; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java index e9a235e3ca55..5ad34142404e 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java @@ -30,6 +30,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -1487,10 +1488,12 @@ private LuceneQuery newDrugQuery(String drugName, boolean searchKeywords, Collections.singletonList(locale), exactLocale, includeRetired, null, null, null, null, null); List conceptIds = conceptNameQuery.listProjection("concept.conceptId"); if (!conceptIds.isEmpty()) { - CollectionUtils.transform(conceptIds, input -> ((Object[]) input)[0].toString()); + List conceptIdStrings = conceptIds.stream() + .map(input -> ((Object[]) input)[0].toString()) + .collect(Collectors.toList()); //The default Lucene clauses limit is 1024. We arbitrarily chose to use 512 here as it does not make sense to return more hits by concept name anyway. - int maxSize = (conceptIds.size() < 512) ? conceptIds.size() : 512; - query.append(" OR concept.conceptId:(").append(StringUtils.join(conceptIds.subList(0, maxSize), " OR ")) + int maxSize = Math.min(conceptIdStrings.size(), 512); + query.append(" OR concept.conceptId:(").append(StringUtils.join(conceptIdStrings.subList(0, maxSize), " OR ")) .append(")^0.1"); } } diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java index 5112b951ef03..e0e86e07b08a 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java @@ -21,7 +21,7 @@ import javax.persistence.criteria.Root; import javax.persistence.criteria.Subquery; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.FlushMode; import org.hibernate.SQLQuery; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java index 40faf2bca77c..64d4ead592cb 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.regex.Pattern; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.Query; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java index 58f36f72a7fa..a42717c3fb89 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java @@ -23,7 +23,7 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java index 6b41724f4222..f28963bb0797 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java index ffbdee04b53e..9f75a731b694 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.openmrs.Concept; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java b/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java index 3714f92935f3..3b55ca43c9cd 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/ImmutableEntityInterceptor.java @@ -9,7 +9,7 @@ */ package org.openmrs.api.db.hibernate; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.hibernate.EmptyInterceptor; import org.hibernate.type.Type; diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java b/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java index 8e0ad910efdb..b8248c757940 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.SessionFactory; import org.openmrs.Encounter; diff --git a/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java b/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java index 0ffc6e6f6fd5..0d1a7a4c039f 100644 --- a/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java +++ b/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.openmrs.Encounter; import org.openmrs.Order; import org.openmrs.Patient; diff --git a/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java b/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java index f695941abd97..caa19fb4921e 100644 --- a/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java +++ b/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.openmrs.Encounter; import org.openmrs.Patient; import org.openmrs.User; diff --git a/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java index 23464564064a..14b67e6706ed 100644 --- a/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java @@ -25,7 +25,7 @@ import java.util.UUID; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.hibernate.Hibernate; diff --git a/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java index 6b20b00a16b5..89cfabc5ba47 100644 --- a/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.Cohort; import org.openmrs.Encounter; diff --git a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java index 82d392155810..fc6df7606f33 100644 --- a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.openmrs.Address; import org.openmrs.Location; import org.openmrs.LocationAttribute; diff --git a/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java index 5cc15c77f6f5..220452c1fa1b 100644 --- a/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java +++ b/api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.OrderSet; import org.openmrs.OrderSetAttribute; diff --git a/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java b/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java index e92dce96a187..50f7669fff59 100644 --- a/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java +++ b/api/src/main/java/org/openmrs/util/databasechange/ConceptValidatorChangeSet.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.set.ListOrderedSet; import org.apache.commons.lang3.StringUtils; diff --git a/api/src/main/java/org/openmrs/validator/CohortValidator.java b/api/src/main/java/org/openmrs/validator/CohortValidator.java index d7f99fd503d1..abdcb527cb00 100644 --- a/api/src/main/java/org/openmrs/validator/CohortValidator.java +++ b/api/src/main/java/org/openmrs/validator/CohortValidator.java @@ -11,7 +11,7 @@ import java.util.Collection; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.openmrs.Cohort; import org.openmrs.CohortMembership; import org.openmrs.Patient; diff --git a/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java b/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java index 79dba0ede222..33d15315f3e7 100644 --- a/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java +++ b/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java @@ -12,7 +12,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.openmrs.ConceptReferenceTerm; import org.openmrs.ConceptReferenceTermMap; import org.openmrs.annotation.Handler; diff --git a/api/src/main/java/org/openmrs/validator/ConceptValidator.java b/api/src/main/java/org/openmrs/validator/ConceptValidator.java index 7e816d7217c3..857ee0273468 100644 --- a/api/src/main/java/org/openmrs/validator/ConceptValidator.java +++ b/api/src/main/java/org/openmrs/validator/ConceptValidator.java @@ -14,7 +14,7 @@ import java.util.Locale; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.Concept; import org.openmrs.ConceptAnswer; diff --git a/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java b/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java index a38c18825987..44b00a9092d1 100644 --- a/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java +++ b/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; import org.junit.jupiter.api.Test; import org.openmrs.api.APIException; diff --git a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java index 487d814583ff..5aac3b26a90f 100644 --- a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java +++ b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; import net.sf.ehcache.Ehcache; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.dbunit.dataset.IDataSet; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/org/openmrs/api/PatientServiceTest.java b/api/src/test/java/org/openmrs/api/PatientServiceTest.java index 6b7b551f679e..45ef5c0ee78e 100644 --- a/api/src/test/java/org/openmrs/api/PatientServiceTest.java +++ b/api/src/test/java/org/openmrs/api/PatientServiceTest.java @@ -41,7 +41,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java b/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java index 24d3fce11442..b280a19eaf58 100644 --- a/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java +++ b/api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.junit.jupiter.api.Test; import org.openmrs.Cohort; import org.openmrs.CohortMembership; diff --git a/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java b/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java index 1ad11c3cdf31..1ac4e1901cd4 100644 --- a/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java +++ b/api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.junit.jupiter.api.Test; import org.openmrs.Cohort; import org.openmrs.CohortMembership; diff --git a/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java b/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java index 6b0359a3e0f4..bc6bd6789e1d 100644 --- a/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java +++ b/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java @@ -11,7 +11,7 @@ import liquibase.changelog.ChangeSet; import liquibase.exception.LockException; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.openmrs.liquibase.ChangeLogDetective; import org.openmrs.util.DatabaseUpdateException;