TRUNK-5303 Use commons-lang3 instead of legacy commons-lang

* replace use of legacy commons-lang methods with commons-lang3 * replace use of Validate.nonNull() with simple java code throwing an IllegalArgumentException when the object under test is null since the commons-lang3 switched to throwing a NullPointerException * add checkstyle rule preventing import from commons-lang which should be picked up by codacy so we can get rid of commons-lang at some point
Wandji69 · Jan 5, 2018 · e57d240 · e57d240
1 parent 8717efc
commit e57d240
Show file tree

Hide file tree

Showing 95 changed files with 112 additions and 108 deletions.
diff --git a/api/src/main/java/org/openmrs/Concept.java b/api/src/main/java/org/openmrs/Concept.java
@@ -24,7 +24,7 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;

diff --git a/api/src/main/java/org/openmrs/ConceptName.java b/api/src/main/java/org/openmrs/ConceptName.java
@@ -14,7 +14,7 @@
 import java.util.HashSet;
 import java.util.Locale;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
 import org.apache.lucene.analysis.standard.StandardFilterFactory;
 import org.apache.lucene.analysis.standard.StandardTokenizerFactory;

diff --git a/api/src/main/java/org/openmrs/DrugOrder.java b/api/src/main/java/org/openmrs/DrugOrder.java
@@ -11,7 +11,7 @@
 
 import static org.openmrs.Order.Action.DISCONTINUE;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.util.OpenmrsUtil;
 
 /**

diff --git a/api/src/main/java/org/openmrs/Duration.java b/api/src/main/java/org/openmrs/Duration.java
@@ -9,11 +9,11 @@
  */
 package org.openmrs;
 
-import static org.apache.commons.lang.time.DateUtils.addHours;
-import static org.apache.commons.lang.time.DateUtils.addMinutes;
-import static org.apache.commons.lang.time.DateUtils.addMonths;
-import static org.apache.commons.lang.time.DateUtils.addWeeks;
-import static org.apache.commons.lang.time.DateUtils.addYears;
+import static org.apache.commons.lang3.time.DateUtils.addHours;
+import static org.apache.commons.lang3.time.DateUtils.addMinutes;
+import static org.apache.commons.lang3.time.DateUtils.addMonths;
+import static org.apache.commons.lang3.time.DateUtils.addWeeks;
+import static org.apache.commons.lang3.time.DateUtils.addYears;
 import static org.apache.commons.lang3.time.DateUtils.addDays;
 import static org.apache.commons.lang3.time.DateUtils.addSeconds;
 

diff --git a/api/src/main/java/org/openmrs/Obs.java b/api/src/main/java/org/openmrs/Obs.java
@@ -20,7 +20,7 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.annotation.AllowDirectAccess;
 import org.openmrs.api.APIException;
 import org.openmrs.api.context.Context;

diff --git a/api/src/main/java/org/openmrs/OrderType.java b/api/src/main/java/org/openmrs/OrderType.java
@@ -12,7 +12,7 @@
 import java.util.Collection;
 import java.util.LinkedHashSet;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.annotation.Independent;
 import org.openmrs.api.APIException;
 import org.openmrs.api.context.Context;

diff --git a/api/src/main/java/org/openmrs/PatientIdentifierType.java b/api/src/main/java/org/openmrs/PatientIdentifierType.java
@@ -9,7 +9,7 @@
  */
 package org.openmrs;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.search.annotations.Field;
 
 /**

diff --git a/api/src/main/java/org/openmrs/PersonAddress.java b/api/src/main/java/org/openmrs/PersonAddress.java
@@ -9,13 +9,13 @@
  */
 package org.openmrs;
 
-import static org.apache.commons.lang.StringUtils.defaultString;
+import static org.apache.commons.lang3.StringUtils.defaultString;
 
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.openmrs.util.OpenmrsUtil;
 import org.slf4j.Logger;

diff --git a/api/src/main/java/org/openmrs/PersonAttribute.java b/api/src/main/java/org/openmrs/PersonAttribute.java
@@ -15,7 +15,7 @@
 import java.util.Comparator;
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.Boost;
 import org.hibernate.search.annotations.DocumentId;

diff --git a/api/src/main/java/org/openmrs/PersonName.java b/api/src/main/java/org/openmrs/PersonName.java
@@ -9,15 +9,15 @@
  */
 package org.openmrs;
 
-import static org.apache.commons.lang.StringUtils.defaultString;
+import static org.apache.commons.lang3.StringUtils.defaultString;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.Boost;

diff --git a/api/src/main/java/org/openmrs/User.java b/api/src/main/java/org/openmrs/User.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.api.context.Context;
 import org.openmrs.util.LocaleUtility;
 import org.openmrs.util.OpenmrsConstants;

diff --git a/api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java b/api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.module.Module;
 import org.openmrs.module.ModuleFactory;
 import org.openmrs.module.ModuleUtil;

diff --git a/api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java b/api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
@@ -12,7 +12,7 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.User;
 import org.openmrs.annotation.AuthorizedAnnotationAttributes;
 import org.openmrs.api.APIAuthenticationException;

diff --git a/api/src/main/java/org/openmrs/api/context/Context.java b/api/src/main/java/org/openmrs/api/context/Context.java
@@ -25,7 +25,7 @@
 import javax.mail.Session;
 
 import org.aopalliance.aop.Advice;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Allergen;
 import org.openmrs.GlobalProperty;
 import org.openmrs.PersonName;

diff --git a/api/src/main/java/org/openmrs/api/context/UserContext.java b/api/src/main/java/org/openmrs/api/context/UserContext.java
@@ -16,7 +16,7 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Location;
 import org.openmrs.Role;
 import org.openmrs.User;

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
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.Query;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java
@@ -16,7 +16,7 @@
 import java.util.Properties;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.SQLQuery;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.SessionFactory;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.DetachedCriteria;

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
@@ -13,7 +13,7 @@
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.SQLQuery;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
@@ -15,7 +15,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.LockOptions;

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
@@ -21,7 +21,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;

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
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 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
@@ -17,7 +17,7 @@
 import java.util.Map;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.SessionFactory;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java
@@ -13,7 +13,7 @@
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;
 import org.hibernate.SessionFactory;

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
@@ -14,7 +14,7 @@
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.hibernate.EmptyInterceptor;
 import org.hibernate.type.Type;
 import org.openmrs.Retireable;

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
@@ -14,7 +14,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Conjunction;

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java b/api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java
@@ -11,7 +11,6 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.Validate;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.openmrs.collection.ListPart;
@@ -28,8 +27,12 @@ public abstract class SearchQuery<T> {
 	private final Session session;
 
 	public SearchQuery(Session session, Class<T> type) {
-		Validate.notNull(session);
-		Validate.notNull(type);
+		if (session == null) {
+			throw new IllegalArgumentException("session must not be null");
+		}
+		if (type == null) {
+			throw new IllegalArgumentException("type must not be null");
+		}
 
 		this.session = session;
 		this.type = type;

diff --git a/api/src/main/java/org/openmrs/api/handler/ConceptSaveHandler.java b/api/src/main/java/org/openmrs/api/handler/ConceptSaveHandler.java
@@ -11,7 +11,7 @@
 
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Concept;
 import org.openmrs.ConceptAnswer;
 import org.openmrs.ConceptDescription;

diff --git a/api/src/main/java/org/openmrs/api/handler/ExistingOrNewVisitAssignmentHandler.java b/api/src/main/java/org/openmrs/api/handler/ExistingOrNewVisitAssignmentHandler.java
@@ -13,7 +13,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Encounter;
 import org.openmrs.EncounterType;
 import org.openmrs.GlobalProperty;

diff --git a/api/src/main/java/org/openmrs/api/handler/RequireVoidReasonSaveHandler.java b/api/src/main/java/org/openmrs/api/handler/RequireVoidReasonSaveHandler.java
@@ -11,7 +11,7 @@
 
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Encounter;
 import org.openmrs.Patient;
 import org.openmrs.User;

diff --git a/api/src/main/java/org/openmrs/api/handler/RequireVoidReasonVoidHandler.java b/api/src/main/java/org/openmrs/api/handler/RequireVoidReasonVoidHandler.java
@@ -11,7 +11,7 @@
 
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Cohort;
 import org.openmrs.Encounter;
 import org.openmrs.Obs;

diff --git a/api/src/main/java/org/openmrs/api/handler/UserSaveHandler.java b/api/src/main/java/org/openmrs/api/handler/UserSaveHandler.java
@@ -12,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Patient;
 import org.openmrs.User;
 import org.openmrs.annotation.Handler;

diff --git a/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
@@ -9,7 +9,7 @@
  */
 package org.openmrs.api.impl;
 
-import static org.apache.commons.lang.StringUtils.contains;
+import static org.apache.commons.lang3.StringUtils.contains;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;

diff --git a/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Cohort;
 import org.openmrs.Encounter;
 import org.openmrs.EncounterRole;

diff --git a/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.proxy.HibernateProxy;
 import org.openmrs.CareSetting;
 import org.openmrs.Concept;

diff --git a/api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
@@ -9,7 +9,7 @@
  */
 package org.openmrs.api.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Allergen;
 import org.openmrs.Allergies;
 import org.openmrs.Allergy;

diff --git a/api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Person;
 import org.openmrs.PersonAddress;