Upgrade to commons-lang3

pom.xml

@@ -63,7 +63,7 @@
 		<commons.collections.version>3.2.1</commons.collections.version>
 		<commons.fileupload.version>1.3.1</commons.fileupload.version>
 		<commons.io.version>2.4</commons.io.version>
-		<commons.lang.version>2.6</commons.lang.version>
+		<commons.lang.version>3.7</commons.lang.version>
 		<commons.logging.version>1.2</commons.logging.version>
 		<commons.validator.version>1.4.0</commons.validator.version>
 
@@ -152,10 +152,16 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons.io.version}</version>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
 			<version>${commons.lang.version}</version>
 		</dependency>
 

src/main/java/org/genesys2/server/listener/sample/CreateAdminListener.java

@@ -46,7 +46,7 @@ public class CreateAdminListener extends RunAsAdminListener {
 	public void init() throws Exception {
 		LOG.info("Checking for at least one account");
 
-		if (userService.listUsers(new PageRequest(0, 1)).getTotalElements() == 0) {
+		if (userService.listUsers(new PageRequest(0, 2)).getTotalElements() < 2) {
 			createDefaultAccounts();
 		}
 	}

src/main/java/org/genesys2/server/listener/sample/FirstRunListener.java

@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.genesys.blocks.oauth.model.OAuthClient;
 import org.genesys.blocks.oauth.model.OAuthRole;

src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.AccessionAlias;
 import org.genesys2.server.model.genesys.AccessionAlias.AliasType;
 import org.genesys2.server.model.genesys.AccessionBreeding;

src/main/java/org/genesys2/server/model/elastic/Alias.java

 package org.genesys2.server.model.elastic;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.AccessionAlias;
 import org.genesys2.server.model.genesys.AccessionAlias.AliasType;
 import org.springframework.data.elasticsearch.annotations.Field;

src/main/java/org/genesys2/server/model/elastic/Collect.java

@@ -4,7 +4,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.AccessionCollect;
 import org.genesys2.util.MCPDUtil;
 import org.springframework.data.elasticsearch.annotations.Field;

src/main/java/org/genesys2/server/model/elastic/Geo.java

 package org.genesys2.server.model.elastic;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.AccessionGeo;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldIndex;

src/main/java/org/genesys2/server/model/elastic/Remark.java

 package org.genesys2.server.model.elastic;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.AccessionRemark;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldIndex;

src/main/java/org/genesys2/server/model/elastic/Taxonomy.java

 package org.genesys2.server.model.elastic;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Taxonomy2;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldIndex;

src/main/java/org/genesys2/server/model/genesys/AccessionCollect.java

@@ -25,7 +25,7 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Version;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.auditlog.annotations.Audited;
 import org.genesys.blocks.model.BasicModel;
 import org.hibernate.annotations.Type;

src/main/java/org/genesys2/server/model/genesys/AccessionGeo.java

@@ -26,7 +26,7 @@ import javax.persistence.PreUpdate;
 import javax.persistence.Table;
 import javax.persistence.Version;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.auditlog.annotations.Audited;
 import org.genesys.blocks.model.BasicModel;
 import org.genesys.worldclim.WorldClimUtil;

src/main/java/org/genesys2/server/model/genesys/Taxonomy2.java

@@ -33,7 +33,7 @@ import javax.persistence.UniqueConstraint;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.GlobalVersionedAuditedModel;
 import org.genesys2.server.model.impl.CropTaxonomy;
 import org.hibernate.annotations.Type;

src/main/java/org/genesys2/server/model/genesys/TraitCode.java

@@ -25,7 +25,7 @@ import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Class representing one coded trait descriptor value.

src/main/java/org/genesys2/server/model/impl/Crop.java

@@ -43,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.model.AclAwareModel;
 import org.genesys2.server.model.GlobalVersionedAuditedModel;
 import org.hibernate.annotations.Type;

src/main/java/org/genesys2/server/model/impl/FaoInstitute.java

@@ -38,7 +38,7 @@ import javax.persistence.UniqueConstraint;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.model.BasicModel;
 import org.genesys.blocks.model.EntityId;
 import org.genesys.blocks.security.model.AclAwareModel;

src/main/java/org/genesys2/server/model/json/GenesysJsonFactory.java

@@ -19,7 +19,7 @@ package org.genesys2.server.model.json;
 import java.util.List;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.AccessionBreeding;
 import org.genesys2.server.model.genesys.AccessionCollect;
 import org.genesys2.server.model.genesys.AccessionData;

src/main/java/org/genesys2/server/service/impl/BatchRESTServiceImpl.java

@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.glis.v1.TermConstants;
 import org.genesys.glis.v1.api.GenesysApi;
 import org.genesys.glis.v1.model.UpdateTargets;

src/main/java/org/genesys2/server/service/impl/ContentServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.genesys.blocks.auditlog.service.ClassPKService;

src/main/java/org/genesys2/server/service/impl/CropServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Taxonomy2;
 import org.genesys2.server.model.impl.Crop;
 import org.genesys2.server.model.impl.CropRule;

src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java

@@ -25,7 +25,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Method;
 import org.genesys2.server.service.FilterConstants;
 import org.genesys2.server.service.MappingService.CoordUtil;

src/main/java/org/genesys2/server/service/impl/DownloadServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.List;
 
 import com.opencsv.CSVWriter;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;

src/main/java/org/genesys2/server/service/impl/EMailServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
 import javax.mail.internet.MimeMessage;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.service.EMailService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/genesys2/server/service/impl/FilterHandler.java

@@ -26,7 +26,7 @@ import java.util.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.filters.AutocompleteFilter;
 import org.genesys2.server.model.filters.BasicFilter;
 import org.genesys2.server.model.filters.CodedMethodFilter;

src/main/java/org/genesys2/server/service/impl/GenesysRESTServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Accession;
 import org.genesys2.server.model.genesys.AccessionBreeding;
 import org.genesys2.server.model.genesys.AccessionCollect;

src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java

@@ -44,7 +44,7 @@ import com.opencsv.ResultSetHelperService;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.SecurityContextUtil;
 import org.genesys.blocks.security.model.AclSid;
 import org.genesys.blocks.security.service.CustomAclService;

src/main/java/org/genesys2/server/service/impl/GeoServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.impl.Country;
 import org.genesys2.server.model.impl.FaoInstitute;
 import org.genesys2.server.model.impl.ITPGRFAStatus;

src/main/java/org/genesys2/server/service/impl/InstituteFilesServiceImpl.java

@@ -19,7 +19,7 @@ package org.genesys2.server.service.impl;
 import java.io.IOException;
 import java.util.UUID;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.filerepository.InvalidRepositoryFileDataException;
 import org.genesys.filerepository.InvalidRepositoryPathException;
 import org.genesys.filerepository.NoSuchRepositoryFileException;

src/main/java/org/genesys2/server/service/impl/InstituteServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.SecurityContextUtil;
 import org.genesys.blocks.security.model.AclSid;
 import org.genesys.blocks.security.service.CustomAclService;

src/main/java/org/genesys2/server/service/impl/JsoupHtmlConverter.java

@@ -16,7 +16,7 @@
 
 package org.genesys2.server.service.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.service.HtmlConverter;
 import org.jsoup.Jsoup;
 import org.jsoup.helper.StringUtil;

src/main/java/org/genesys2/server/service/impl/KPIServiceImpl.java

@@ -29,7 +29,7 @@ import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.kpi.Dimension;
 import org.genesys2.server.model.kpi.DimensionKey;
 import org.genesys2.server.model.kpi.Execution;

src/main/java/org/genesys2/server/service/impl/PDCICalculator.java

@@ -18,7 +18,7 @@ package org.genesys2.server.service.impl;
 
 import java.util.ArrayList;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.elastic.AccessionDetails;
 import org.genesys2.server.model.elastic.Alias;
 import org.genesys2.server.model.elastic.Collect;

src/main/java/org/genesys2/server/service/impl/RequestServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.Set;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Accession;
 import org.genesys2.server.model.genesys.MaterialRequest;
 import org.genesys2.server.model.genesys.MaterialSubRequest;

src/main/java/org/genesys2/server/service/impl/TaxonomyManager.java

@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Resource;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang.WordUtils;
 import org.genesys2.server.model.genesys.Taxonomy2;
 import org.genesys2.server.service.TaxonomyService;

src/main/java/org/genesys2/server/service/impl/TaxonomyServiceImpl.java

@@ -20,7 +20,7 @@ import java.math.BigInteger;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Taxonomy2;
 import org.genesys2.server.model.impl.Crop;
 import org.genesys2.server.persistence.domain.Taxonomy2Repository;

src/main/java/org/genesys2/server/service/impl/TraitServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.SecurityContextUtil;
 import org.genesys.blocks.security.model.AclSid;
 import org.genesys.blocks.security.service.CustomAclService;

src/main/java/org/genesys2/server/service/impl/UserServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.genesys.blocks.security.NoUserFoundException;
 import org.genesys.blocks.security.NotUniqueUserException;

src/main/java/org/genesys2/server/service/worker/CountryAlternateNamesUpdater.java

@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang.time.StopWatch;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

src/main/java/org/genesys2/server/service/worker/GeoNamesCountrySource.java

@@ -27,7 +27,7 @@ import com.opencsv.CSVReader;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;

src/main/java/org/genesys2/server/service/worker/ITPGRFAStatusUpdater.java

@@ -28,7 +28,7 @@ import com.opencsv.CSVReader;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang.time.StopWatch;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

src/main/java/org/genesys2/server/service/worker/InstituteUpdater.java

@@ -33,7 +33,7 @@ import com.opencsv.CSVReader;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;

src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java

@@ -33,7 +33,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

src/main/java/org/genesys2/server/servlet/controller/ArticleController.java

@@ -27,7 +27,7 @@ import java.util.TreeMap;
 import javax.annotation.Resource;
 import javax.naming.NoPermissionException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.model.ClassPK;
 import org.genesys2.server.model.impl.Article;
 import org.genesys2.server.service.CRMException;

src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java

@@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jhlabs.image.MapColorsFilter;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
 import org.genesys2.server.model.elastic.AccessionDetails;
 import org.genesys2.server.model.filters.GenesysFilter;

src/main/java/org/genesys2/server/servlet/controller/JspHelper.java

@@ -23,7 +23,7 @@ import java.util.Locale;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang.math.RandomUtils;
 import org.genesys.blocks.security.model.AclSid;
 import org.genesys.blocks.security.service.CustomAclService;

src/main/java/org/genesys2/server/servlet/controller/ProjectController.java

@@ -30,7 +30,7 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.impl.AccessionList;
 import org.genesys2.server.model.impl.Project;
 import org.genesys2.server.service.AccessionListService;

src/main/java/org/genesys2/server/servlet/controller/RequestController.java

@@ -22,7 +22,7 @@ import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.SecurityContextUtil;
 import org.genesys2.server.model.impl.User;
 import org.genesys2.server.service.ContentService;

src/main/java/org/genesys2/server/servlet/controller/RobotsTxtController.java

@@ -19,7 +19,7 @@ package org.genesys2.server.servlet.controller;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/org/genesys2/server/servlet/controller/SearchController.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.model.ClassPK;
 import org.genesys2.server.model.impl.ActivityPost;
 import org.genesys2.server.model.impl.Article;

src/main/java/org/genesys2/server/servlet/controller/SelectionController.java

@@ -25,7 +25,7 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.Accession;
 import org.genesys2.server.model.genesys.AccessionData;
 import org.genesys2.server.model.genesys.AccessionGeo;

src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java

@@ -24,7 +24,7 @@ import java.util.Set;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.NotUniqueUserException;
 import org.genesys.blocks.security.UserException;
 import org.genesys.blocks.security.model.BasicUser.AccountType;

src/main/java/org/genesys2/server/servlet/controller/UserRegistrationController.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.model.BasicUser.AccountType;
 import org.genesys.blocks.security.service.PasswordPolicy.PasswordPolicyException;
 import org.genesys2.server.model.UserRole;

src/main/java/org/genesys2/server/servlet/controller/admin/AdminController.java

@@ -34,7 +34,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang.time.StopWatch;
 import org.genesys2.server.persistence.domain.AccessionIdRepository;
 import org.genesys2.server.persistence.domain.AccessionRepository;

src/main/java/org/genesys2/server/servlet/controller/admin/UserProfileController.java

@@ -18,7 +18,7 @@ package org.genesys2.server.servlet.controller.admin;
 
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.NotUniqueUserException;
 import org.genesys.blocks.security.UserException;
 import org.genesys.blocks.security.service.PasswordPolicy.PasswordPolicyException;

src/main/java/org/genesys2/server/servlet/controller/rest/AccessionController.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.elastic.AccessionDetails;
 import org.genesys2.server.model.genesys.Accession;
 import org.genesys2.server.model.impl.FaoInstitute;

src/main/java/org/genesys2/server/servlet/controller/rest/LookupController.java

@@ -21,7 +21,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.impl.Country;
 import org.genesys2.server.service.GenesysService;
 import org.genesys2.server.service.GeoService;

src/main/java/org/genesys2/server/servlet/controller/rest/UsersController.java

@@ -19,7 +19,7 @@ package org.genesys2.server.servlet.controller.rest;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys.blocks.security.NotUniqueUserException;
 import org.genesys.blocks.security.UserException;
 import org.genesys.blocks.security.service.PasswordPolicy.PasswordPolicyException;

src/main/java/org/genesys2/server/servlet/controller/rest/serialization/MaterialRequestSerializer.java

@@ -19,7 +19,7 @@ package org.genesys2.server.servlet.controller.rest.serialization;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.MaterialRequest;
 import org.genesys2.server.model.genesys.MaterialSubRequest;
 import org.hibernate.LazyInitializationException;

src/main/java/org/genesys2/server/servlet/controller/rest/serialization/MaterialSubRequestSerializer.java

@@ -18,7 +18,7 @@ package org.genesys2.server.servlet.controller.rest.serialization;
 
 import java.io.IOException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.genesys2.server.model.genesys.MaterialSubRequest;
 
 import com.fasterxml.jackson.core.JsonGenerator;

src/main/java/org/genesys2/server/servlet/filter/LocaleURLFilter.java

@@ -30,7 +30,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/genesys2/server/servlet/filter/LocaleWrappedServletResponse.java

@@ -19,7 +19,7 @@ package org.genesys2.server.servlet.filter;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-import org.apache.commons.lang.StringUtils;