chore: Remove most usages of commons-lang TECH-777 (dhis2#9104)

davidhuser · Oct 26, 2021 · 6f572a9 · 6f572a9
1 parent 8fb5432
commit 6f572a9
Show file tree

Hide file tree

Showing 71 changed files with 95 additions and 83 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/QueryKey.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/QueryKey.java
@@ -32,7 +32,7 @@
 import java.util.function.Supplier;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Lars Helge Overland

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java
@@ -36,7 +36,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.calendar.Calendar;
 import org.hisp.dhis.calendar.DateTimeUnit;
 import org.hisp.dhis.category.Category;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/PagerUtils.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/PagerUtils.java
@@ -31,7 +31,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryFilter.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryFilter.java
@@ -33,7 +33,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java
@@ -33,7 +33,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.analytics.AggregationType;
 import org.hisp.dhis.analytics.QueryKey;
 import org.hisp.dhis.dataelement.DataElement;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/deduplication/PotentialDuplicateQuery.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/deduplication/PotentialDuplicateQuery.java
@@ -31,7 +31,7 @@
 
 import lombok.Data;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.hisp.dhis.common.Pager;
 import org.hisp.dhis.common.PagerUtils;
 

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/deletedobject/DeletedObjectQuery.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/deletedobject/DeletedObjectQuery.java
@@ -31,7 +31,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.Pager;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElementQueryParams.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElementQueryParams.java
@@ -29,7 +29,7 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.hisp.dhis.common.Pager;
 import org.hisp.dhis.common.PagerUtils;
 

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java
@@ -34,7 +34,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.hisp.dhis.analytics.AnalyticsFinancialYearStartKey;
 import org.hisp.dhis.calendar.DateTimeUnit;
 import org.hisp.dhis.calendar.impl.Iso8601Calendar;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/AuthenticationSerializer.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/AuthenticationSerializer.java
@@ -29,7 +29,7 @@
 
 import javax.xml.bind.DatatypeConverter;
 
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.security.core.Authentication;
 
 public class AuthenticationSerializer

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewQuery.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewQuery.java
@@ -29,7 +29,7 @@
 
 import java.util.Set;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.hisp.dhis.common.Pager;
 import org.hisp.dhis.common.PagerUtils;
 

diff --git a/.../dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceQueryParams.java b/.../dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceQueryParams.java
@@ -43,7 +43,7 @@
 import lombok.Getter;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.hisp.dhis.common.AssignedUserSelectionMode;
 import org.hisp.dhis.common.OrganisationUnitSelectionMode;
 import org.hisp.dhis.common.QueryFilter;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java
@@ -30,7 +30,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.apache.commons.lang.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.hisp.dhis.category.CategoryOptionCombo;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationResultQuery.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationResultQuery.java
@@ -30,7 +30,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.hisp.dhis.common.Pager;
 import org.hisp.dhis.common.PagerUtils;
 

diff --git a/...his-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java b/...his-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java
@@ -38,7 +38,6 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.hisp.dhis.common.Grid;
 import org.hisp.dhis.common.IllegalQueryException;
@@ -199,7 +198,7 @@ private void canAccess( SqlView sqlView )
     private String parseFilters( List<String> filters, SqlHelper sqlHelper )
         throws QueryParserException
     {
-        String query = StringUtils.EMPTY;
+        String query = "";
 
         for ( String filter : filters )
         {
@@ -221,7 +220,7 @@ private String parseFilters( List<String> filters, SqlHelper sqlHelper )
 
     private String getFilterQuery( SqlHelper sqlHelper, String columnName, String operator, String value )
     {
-        String query = StringUtils.EMPTY;
+        String query = "";
 
         query += sqlHelper.whereAnd() + " " + columnName + " " + QueryUtils.parseFilterOperator( operator, value );
 
@@ -307,7 +306,7 @@ private String getSqlForView( SqlView sqlView, Map<String, String> criteria, Lis
 
     private String getCriteriaSqlClause( Map<String, String> criteria, SqlHelper sqlHelper )
     {
-        String sql = StringUtils.EMPTY;
+        String sql = "";
 
         if ( criteria != null && !criteria.isEmpty() )
         {

diff --git a/...is-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java b/...is-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
@@ -28,7 +28,7 @@
 package org.hisp.dhis.analytics.data;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.commons.lang.time.DateUtils.addYears;
+import static org.apache.commons.lang3.time.DateUtils.addYears;
 import static org.hisp.dhis.analytics.AggregationType.AVERAGE;
 import static org.hisp.dhis.analytics.AggregationType.COUNT;
 import static org.hisp.dhis.analytics.AggregationType.MAX;

diff --git a/...service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcRawAnalyticsManager.java b/...service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcRawAnalyticsManager.java
@@ -40,7 +40,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.analytics.DataQueryParams;
 import org.hisp.dhis.analytics.RawAnalyticsManager;
 import org.hisp.dhis.analytics.util.AnalyticsUtils;

diff --git a/...tics/src/main/java/org/hisp/dhis/analytics/event/data/EnrollmentTimeFieldSqlRenderer.java b/...tics/src/main/java/org/hisp/dhis/analytics/event/data/EnrollmentTimeFieldSqlRenderer.java
@@ -49,7 +49,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.analytics.TimeField;
 import org.hisp.dhis.analytics.event.EventQueryParams;
 import org.hisp.dhis.common.DimensionalItemObject;

diff --git a/...analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java b/...analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.analytics.event.data;
 
-import static org.apache.commons.lang.time.DateUtils.addYears;
+import static org.apache.commons.lang3.time.DateUtils.addYears;
 import static org.hisp.dhis.analytics.event.EventAnalyticsService.ITEM_LATITUDE;
 import static org.hisp.dhis.analytics.event.EventAnalyticsService.ITEM_LONGITUDE;
 import static org.hisp.dhis.analytics.table.JdbcEventAnalyticsTableManager.OU_GEOMETRY_COL_SUFFIX;

diff --git a/...services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java b/...services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java
@@ -40,7 +40,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.commons.util.DebugUtils;
 import org.hisp.dhis.configuration.ConfigurationService;
 import org.hisp.dhis.dataset.CompleteDataSetRegistration;

diff --git a/...rc/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java b/...rc/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java
@@ -40,7 +40,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;

diff --git a/...dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java b/...dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java
@@ -70,7 +70,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.antlr.Parser;
 import org.hisp.dhis.antlr.ParserException;
 import org.hisp.dhis.cache.Cache;

diff --git a/...ice-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java b/...ice-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
@@ -51,8 +51,8 @@
 import lombok.Builder;
 import lombok.Getter;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;

diff --git a/...ore/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java b/...ore/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
@@ -38,7 +38,7 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
 import org.hisp.dhis.common.hibernate.SoftDeleteHibernateObjectStore;

diff --git a/...e/src/main/java/org/hisp/dhis/program/notification/DefaultProgramNotificationService.java b/...e/src/main/java/org/hisp/dhis/program/notification/DefaultProgramNotificationService.java
@@ -46,8 +46,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.common.DeliveryChannel;
 import org.hisp.dhis.common.IdentifiableObjectManager;
 import org.hisp.dhis.eventdatavalue.EventDataValue;

diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/JpaQueryUtils.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/JpaQueryUtils.java
@@ -43,7 +43,7 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.commons.collection.CollectionUtils;
 import org.hisp.dhis.hibernate.jsonb.type.JsonbFunctions;

diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/QueryUtils.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/QueryUtils.java
@@ -41,8 +41,8 @@
 import javax.annotation.Nullable;
 import javax.persistence.TypedQuery;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.hisp.dhis.schema.Property;
 import org.hisp.dhis.schema.Schema;
 import org.hisp.dhis.util.DateUtils;

diff --git a/...rvice-core/src/main/java/org/hisp/dhis/security/oidc/GenericOidcProviderConfigParser.java b/...rvice-core/src/main/java/org/hisp/dhis/security/oidc/GenericOidcProviderConfigParser.java
@@ -62,7 +62,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.validator.routines.UrlValidator;
 import org.hisp.dhis.security.oidc.provider.GenericOidcProviderBuilder;

diff --git a/...rvices/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/CommandSMSListener.java b/...rvices/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/CommandSMSListener.java
@@ -41,7 +41,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.category.CategoryService;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.eventdatavalue.EventDataValue;

diff --git a/...es/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/CompressionSMSListener.java b/...es/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/CompressionSMSListener.java
@@ -38,7 +38,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.category.CategoryOptionCombo;
 import org.hisp.dhis.category.CategoryService;
 import org.hisp.dhis.common.IdentifiableObject;

diff --git a/...ices/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java b/...ices/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java
@@ -149,15 +149,15 @@ protected void postProcess( IncomingSms sms, SMSCommand smsCommand, Map<String,
 
         if ( parsedMessage.isEmpty() )
         {
-            sendFeedback( org.apache.commons.lang.StringUtils.defaultIfEmpty( smsCommand.getDefaultMessage(),
+            sendFeedback( org.apache.commons.lang3.StringUtils.defaultIfEmpty( smsCommand.getDefaultMessage(),
                 "No values reported for command '" + smsCommand.getName() + "'" ), sms.getOriginator(), ERROR );
 
             update( sms, SmsMessageStatus.FAILED, false );
             return;
         }
         else if ( !valueStored )
         {
-            sendFeedback( org.apache.commons.lang.StringUtils.defaultIfEmpty( smsCommand.getWrongFormatMessage(),
+            sendFeedback( org.apache.commons.lang3.StringUtils.defaultIfEmpty( smsCommand.getWrongFormatMessage(),
                 SMSCommand.WRONG_FORMAT_MESSAGE ), sms.getOriginator(), ERROR );
 
             update( sms, SmsMessageStatus.FAILED, false );

diff --git a/...s-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java b/...s-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java
@@ -40,7 +40,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.calendar.CalendarService;
 import org.hisp.dhis.commons.util.SystemUtils;
 import org.hisp.dhis.configuration.Configuration;

diff --git a/.../java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceAuditStore.java b/.../java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceAuditStore.java
@@ -38,7 +38,7 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 import org.hisp.dhis.audit.payloads.TrackedEntityInstanceAudit;
 import org.hisp.dhis.hibernate.HibernateGenericStore;

diff --git a/...dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java b/...dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
 import org.hisp.dhis.hibernate.HibernateGenericStore;

diff --git a/.../dhis-service-core/src/main/java/org/hisp/dhis/user/PasswordDictionaryValidationRule.java b/.../dhis-service-core/src/main/java/org/hisp/dhis/user/PasswordDictionaryValidationRule.java
@@ -28,7 +28,7 @@
 package org.hisp.dhis.user;
 
 import static java.util.Arrays.asList;
-import static org.apache.commons.lang.StringUtils.containsIgnoreCase;
+import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
 import static org.hisp.dhis.user.PasswordValidationError.PASSWORD_CONTAINS_RESERVED_WORD;
 
 import java.util.List;

diff --git a/...s/dhis-service-core/src/main/java/org/hisp/dhis/user/PasswordMandatoryValidationRule.java b/...s/dhis-service-core/src/main/java/org/hisp/dhis/user/PasswordMandatoryValidationRule.java
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.user;
 
-import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.hisp.dhis.user.PasswordValidationError.PASSWORD_IS_MANDATORY;
 
 /**

diff --git a/...vices/dhis-service-core/src/main/java/org/hisp/dhis/user/UserParameterValidationRule.java b/...vices/dhis-service-core/src/main/java/org/hisp/dhis/user/UserParameterValidationRule.java
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.user;
 
-import static org.apache.commons.lang.StringUtils.containsIgnoreCase;
-import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
+import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
+import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
 import static org.hisp.dhis.user.PasswordValidationError.PASSWORD_CONTAINS_NAME_OR_EMAIL;
 
 /**

diff --git a/...services/dhis-service-core/src/test/java/org/hisp/dhis/query/DefaultQueryServiceTest.java b/...services/dhis-service-core/src/test/java/org/hisp/dhis/query/DefaultQueryServiceTest.java
@@ -36,7 +36,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.query.planner.DefaultQueryPlanner;