diff --git a/NEWS.rst b/NEWS.rst index 8b94d3ef6..84837ad4e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -61,6 +61,7 @@ Changes * Update EasyMock * Update JDBC driver * Update Сommons-IO +* Update AspectJ Weaver * Update LibrePlan version to 1.6.0 diff --git a/libreplan-business/pom.xml b/libreplan-business/pom.xml index 10f9e6d37..e53adf8df 100644 --- a/libreplan-business/pom.xml +++ b/libreplan-business/pom.xml @@ -131,9 +131,8 @@ liquibase-maven-plugin - commons-lang - commons-lang - 2.5 + org.apache.commons + commons-lang3 @@ -150,7 +149,7 @@ org.liquibase liquibase-maven-plugin - 2.0.5 + 3.5.0 process-resources @@ -179,7 +178,7 @@ org.liquibase liquibase-maven-plugin - 2.0.5 + 3.5.0 process-resources @@ -222,7 +221,7 @@ org.liquibase liquibase-maven-plugin - [2.0.5,) + [3.5.0,) update diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignmentTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignmentTemplate.java index 983c7c971..78d0e8005 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignmentTemplate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignmentTemplate.java @@ -22,7 +22,7 @@ package org.libreplan.business.advance.entities; import java.math.BigDecimal; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.orders.entities.OrderElement; diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java index 54cb5cb31..447072f60 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java @@ -25,8 +25,8 @@ import static org.libreplan.business.i18n.I18nHelper._; import java.math.BigDecimal; -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 javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java index 8e3ce8b97..cd06c9173 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/CalendarExceptionTypeDAO.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/CalendarExceptionTypeDAO.java index afe171074..a1542e094 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/CalendarExceptionTypeDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/CalendarExceptionTypeDAO.java @@ -23,7 +23,7 @@ package org.libreplan.business.calendars.daos; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.libreplan.business.calendars.entities.CalendarException; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/AvailabilityTimeLine.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/AvailabilityTimeLine.java index c8a077032..0b4005c05 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/AvailabilityTimeLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/AvailabilityTimeLine.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.List; import java.util.ListIterator; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.joda.time.LocalDate; /** diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java index da272928a..5f78cbbe5 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java @@ -26,10 +26,10 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.Objects; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -923,7 +923,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar, IHuman && calendarAvailability.getId() == null) { return getLastCalendarAvailability() == calendarAvailability; } - return ObjectUtils.equals(getLastCalendarAvailability().getId(), + return Objects.equals(getLastCalendarAvailability().getId(), calendarAvailability.getId()); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarException.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarException.java index a0d06f09f..3b72a392c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarException.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarException.java @@ -21,7 +21,7 @@ package org.libreplan.business.calendars.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; import org.libreplan.business.calendars.daos.ICalendarExceptionDAO; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java index 4f4534984..9c0a5f28b 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java @@ -25,9 +25,9 @@ import static org.libreplan.business.i18n.I18nHelper._; import java.util.EnumMap; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.NonUniqueResultException; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java index 3dbe0b462..3d7423df3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java @@ -25,9 +25,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.EnumMap; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.libreplan.business.workingday.EffortDuration; import org.libreplan.business.workingday.EffortDuration.Granularity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CombinedWorkHours.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CombinedWorkHours.java index 48757154e..17b339a90 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CombinedWorkHours.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CombinedWorkHours.java @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.workingday.EffortDuration; import org.libreplan.business.workingday.IntraDayDate.PartialDay; diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/SameWorkHoursEveryDay.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/SameWorkHoursEveryDay.java index 4ee41d607..05cd596d5 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/SameWorkHoursEveryDay.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/SameWorkHoursEveryDay.java @@ -21,7 +21,7 @@ package org.libreplan.business.calendars.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.workingday.EffortDuration; import org.libreplan.business.workingday.IntraDayDate.PartialDay; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/Configuration.java b/libreplan-business/src/main/java/org/libreplan/business/common/Configuration.java index 90709ff25..8154339ec 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/Configuration.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/Configuration.java @@ -20,7 +20,7 @@ package org.libreplan.business.common; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; /** diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java b/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java index e9bc65af8..a4961b2be 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import org.libreplan.business.common.daos.IIntegrationEntityDAO; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java b/libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java index f39417da0..555c043de 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java @@ -24,7 +24,7 @@ package org.libreplan.business.common.daos; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.NonUniqueResultException; import org.hibernate.criterion.Restrictions; import org.libreplan.business.common.IAdHocTransactionService; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/daos/GenericDAOHibernate.java b/libreplan-business/src/main/java/org/libreplan/business/common/daos/GenericDAOHibernate.java index 8bbad872e..cb38bb367 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/daos/GenericDAOHibernate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/daos/GenericDAOHibernate.java @@ -26,7 +26,7 @@ import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Hibernate; import org.hibernate.LockMode; import org.hibernate.Session; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/daos/IntegrationEntityDAO.java b/libreplan-business/src/main/java/org/libreplan/business/common/daos/IntegrationEntityDAO.java index 3d5b913d0..33bb0b7bd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/daos/IntegrationEntityDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/daos/IntegrationEntityDAO.java @@ -23,7 +23,7 @@ package org.libreplan.business.common.daos; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.libreplan.business.common.IntegrationEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java index 1d0930102..253d85ec2 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java @@ -21,7 +21,7 @@ package org.libreplan.business.common.entities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.Min; import org.hibernate.validator.constraints.NotEmpty; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java index 3c7969200..5aa50fee6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java @@ -27,7 +27,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 javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.Valid; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java index 3b0a079b4..cd65eadcd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java @@ -19,7 +19,7 @@ package org.libreplan.business.common.entities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/exceptions/ValidationException.java b/libreplan-business/src/main/java/org/libreplan/business/common/exceptions/ValidationException.java index e33d82b27..90fa0cb5c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/exceptions/ValidationException.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/exceptions/ValidationException.java @@ -30,7 +30,7 @@ import java.util.Set; import javax.validation.ConstraintViolation; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.BaseEntity; /** diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/CostCategoryDAO.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/CostCategoryDAO.java index 4dd2fb360..85e530911 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/CostCategoryDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/CostCategoryDAO.java @@ -25,7 +25,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java index 212609066..ffc9e3026 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java @@ -24,7 +24,7 @@ package org.libreplan.business.costcategories.daos; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java index 1a3553178..ddf5e935f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java @@ -34,7 +34,7 @@ import javax.validation.constraints.AssertFalse; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; import org.joda.time.LocalDate; import org.libreplan.business.common.IHumanIdentifiable; diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java index 8af79cc20..84321bdb3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java @@ -21,7 +21,7 @@ package org.libreplan.business.costcategories.entities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java index 559f11480..e26c246c4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java @@ -23,7 +23,7 @@ package org.libreplan.business.costcategories.entities; import java.math.BigDecimal; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java b/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java index 646708a50..19d47f165 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java +++ b/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.Min; import org.hibernate.validator.constraints.NotEmpty; @@ -57,7 +57,7 @@ public class ExpenseSheet extends IntegrationEntity implements IHumanIdentifiabl private boolean personal = false; @Valid - private SortedSet expenseSheetLines = new TreeSet( + private SortedSet expenseSheetLines = new TreeSet<>( new ExpenseSheetLineComparator()); private Integer lastExpenseSheetLineSequenceCode = 0; diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java index 3b8f7fc3d..359e2939e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java @@ -21,7 +21,7 @@ package org.libreplan.business.externalcompanies.entities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/hibernate/notification/NotBlockingAutoUpdatedSnapshot.java b/libreplan-business/src/main/java/org/libreplan/business/hibernate/notification/NotBlockingAutoUpdatedSnapshot.java index 502e6cdf8..c69b53336 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/hibernate/notification/NotBlockingAutoUpdatedSnapshot.java +++ b/libreplan-business/src/main/java/org/libreplan/business/hibernate/notification/NotBlockingAutoUpdatedSnapshot.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelTypeDAO.java b/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelTypeDAO.java index d38fd17f0..25efd0fe0 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelTypeDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelTypeDAO.java @@ -23,7 +23,7 @@ package org.libreplan.business.labels.daos; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.NonUniqueResultException; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java index 3bdba5882..52bd3bd64 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java +++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; import org.libreplan.business.common.IntegrationEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java index 644a1aba2..6fc83d6f7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/libreplan-business/src/main/java/org/libreplan/business/materials/daos/MaterialCategoryDAO.java b/libreplan-business/src/main/java/org/libreplan/business/materials/daos/MaterialCategoryDAO.java index ce82f9807..ac39506ea 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/materials/daos/MaterialCategoryDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/materials/daos/MaterialCategoryDAO.java @@ -23,7 +23,7 @@ package org.libreplan.business.materials.daos; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.libreplan.business.common.daos.IntegrationEntityDAO; diff --git a/libreplan-business/src/main/java/org/libreplan/business/materials/daos/UnitTypeDAO.java b/libreplan-business/src/main/java/org/libreplan/business/materials/daos/UnitTypeDAO.java index 78f664161..34169c583 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/materials/daos/UnitTypeDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/materials/daos/UnitTypeDAO.java @@ -23,7 +23,7 @@ package org.libreplan.business.materials.daos; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java index cb4f4fb7f..05b6bd0cf 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java +++ b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java @@ -23,7 +23,7 @@ package org.libreplan.business.materials.entities; import java.math.BigDecimal; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; import org.libreplan.business.common.IntegrationEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java index 292c216e9..21dfcb2eb 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java +++ b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java index 668f54a5b..9a69b5fdf 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java @@ -21,7 +21,7 @@ package org.libreplan.business.materials.entities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import org.libreplan.business.common.IHumanIdentifiable; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/HoursGroupDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/HoursGroupDAO.java index 8b7799844..521e04a49 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/HoursGroupDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/HoursGroupDAO.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java index f8e563dc9..a9788f8dc 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderElementDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderElementDAO.java index 88faf4789..c4c950c12 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderElementDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderElementDAO.java @@ -32,9 +32,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.Objects; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.criterion.Restrictions; @@ -591,7 +591,7 @@ public class OrderElementDAO extends IntegrationEntityDAO if (order1 == null || order2 == null) { return false; } - return ObjectUtils.equals(order1.getId(), order2.getId()); + return Objects.equals(order1.getId(), order2.getId()); } } \ No newline at end of file diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/AggregatedHoursGroup.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/AggregatedHoursGroup.java index 532d9e137..9d9fc4364 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/AggregatedHoursGroup.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/AggregatedHoursGroup.java @@ -30,9 +30,9 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.ResourceEnum; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java index e1b7cbbd7..1e19c5afb 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java @@ -34,7 +34,7 @@ import java.util.UUID; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.IntegrationEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java index e592745cd..67378e637 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java @@ -37,8 +37,8 @@ import javax.validation.Valid; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.libreplan.business.advance.bootstrap.PredefinedAdvancedTypes; import org.libreplan.business.advance.entities.AdvanceType; import org.libreplan.business.advance.entities.DirectAdvanceAssignment; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java index 49e130865..c6790bcf6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java @@ -37,8 +37,8 @@ import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.AssertTrue; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.validator.constraints.NotEmpty; import org.joda.time.LocalDate; import org.libreplan.business.advance.bootstrap.PredefinedAdvancedTypes; @@ -83,7 +83,8 @@ import org.libreplan.business.workingday.IntraDayDate; import org.libreplan.business.workreports.daos.IWorkReportLineDAO; import org.libreplan.business.workreports.entities.WorkReportLine; -public abstract class OrderElement extends IntegrationEntity implements ICriterionRequirable, ITreeNode { +public abstract class +OrderElement extends IntegrationEntity implements ICriterionRequirable, ITreeNode { protected InfoComponentWithCode infoComponent = new InfoComponentWithCode(); diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java index b44be3644..9f142f03f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java @@ -33,7 +33,7 @@ import javax.validation.Valid; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.advance.entities.AdvanceAssignment; import org.libreplan.business.advance.entities.AdvanceType; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java index 0eb963322..7e8bd8412 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java @@ -21,8 +21,8 @@ package org.libreplan.business.orders.entities; import java.util.Date; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingDataForVersion.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingDataForVersion.java index c131f854d..0a0202ed5 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingDataForVersion.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingDataForVersion.java @@ -20,7 +20,7 @@ */ package org.libreplan.business.orders.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import javax.validation.Valid; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java index d7041fcd7..52bf83e19 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java @@ -27,8 +27,8 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * @author Óscar González Fernández * diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SumChargedEffort.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SumChargedEffort.java index 9dd625c1d..b476fda88 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SumChargedEffort.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SumChargedEffort.java @@ -23,7 +23,7 @@ package org.libreplan.business.orders.entities; import java.util.Date; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.workingday.EffortDuration; import org.libreplan.business.workreports.entities.WorkReportLine; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java index 6c07cbf55..a54f03ca8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import javax.validation.Valid; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java b/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java index 5e37116c2..d8edf9806 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java @@ -30,7 +30,7 @@ import java.util.ListIterator; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.Days; import org.joda.time.LocalDate; import org.libreplan.business.planner.chart.ContiguousDaysLine.OnDay; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ResourceAllocationDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ResourceAllocationDAO.java index 2d291053f..5fba15276 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ResourceAllocationDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ResourceAllocationDAO.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.Query; import org.hibernate.Session; import org.joda.time.LocalDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfDayAssignments.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfDayAssignments.java index c11385611..f4689f62e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfDayAssignments.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfDayAssignments.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.DayAssignment; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfResourceAllocations.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfResourceAllocations.java index f39915254..5e2fab35b 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfResourceAllocations.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfResourceAllocations.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.Days; import org.joda.time.LocalDate; import org.libreplan.business.workingday.EffortDuration; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DayAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DayAssignment.java index d2daa5494..9847660e4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DayAssignment.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DayAssignment.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.Objects; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; @@ -196,7 +196,7 @@ public abstract class DayAssignment extends BaseEntity { Scenario scenario, Collection dayAssignments) { List result = new ArrayList(); for (T each : dayAssignments) { - if (ObjectUtils.equals(each.getScenario(), scenario)) { + if (Objects.equals(each.getScenario(), scenario)) { result.add(each); } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Dependency.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Dependency.java index c770634ce..5cbd167c8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Dependency.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Dependency.java @@ -23,7 +23,7 @@ package org.libreplan.business.planner.entities; import java.util.Date; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.planner.limiting.entities.LimitingResourceQueueDependency; import org.libreplan.business.util.deepcopy.Strategy; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocation.java index f49dfa436..1c325cf3f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocation.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocationGenerator.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocationGenerator.java index 99c3991d2..a92796250 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocationGenerator.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocationGenerator.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.EffortDistributor.ResourceWithAssignedDuration; import org.libreplan.business.resources.entities.Criterion; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignment.java index 24ae2a526..7132cba67 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignment.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignment.java @@ -20,7 +20,7 @@ */ package org.libreplan.business.planner.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignmentsContainer.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignmentsContainer.java index 95bf20c8a..7a45744ec 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignmentsContainer.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignmentsContainer.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.scenarios.entities.Scenario; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/EffortDistributor.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/EffortDistributor.java index 88d529cb9..b5df3868f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/EffortDistributor.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/EffortDistributor.java @@ -36,7 +36,7 @@ import java.util.Map.Entry; import java.util.Set; import org.apache.commons.collections.ComparatorUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.Capacity; import org.libreplan.business.calendars.entities.ICalendar; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignment.java index 5517aea3a..fa774f651 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignment.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignment.java @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignmentsContainer.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignmentsContainer.java index 80872afc4..681a64e94 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignmentsContainer.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignmentsContainer.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import javax.validation.Valid; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java index 68b8a5377..24ab7df3a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.Valid; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.AvailabilityTimeLine; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java index a4e8e18da..d4751ea2f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java @@ -37,8 +37,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.Validate; +import java.util.Objects; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.validation.constraints.NotNull; @@ -602,7 +602,7 @@ public abstract class ResourceAllocation extends public boolean areIntendedResourcesPerDaySatisfied() { CalculatedValue calculatedValue = getTask().getCalculatedValue(); return calculatedValue == CalculatedValue.RESOURCES_PER_DAY || - ObjectUtils.equals(getNonConsolidatedResourcePerDay(), getIntendedResourcesPerDay()); + Objects.equals(getNonConsolidatedResourcePerDay(), getIntendedResourcesPerDay()); } public ResourceAllocation(Task task) { diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Share.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Share.java index 9585cc55e..d63e55f1e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Share.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Share.java @@ -21,8 +21,8 @@ package org.libreplan.business.planner.entities; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; public class Share { diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ShareDivision.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ShareDivision.java index a8b395550..0ee05f06d 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ShareDivision.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ShareDivision.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; public class ShareDivision { diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SigmoidFunction.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SigmoidFunction.java index 07a2a0703..d76462ecd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SigmoidFunction.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SigmoidFunction.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.workingday.EffortDuration; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignment.java index 582e7605d..b1e7b086c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignment.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignment.java @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignmentsContainer.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignmentsContainer.java index 58f7f4c7b..b6ab54a48 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignmentsContainer.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignmentsContainer.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import javax.validation.Valid; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java index 34ee7d3fc..b349059bd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import javax.validation.Valid; import org.joda.time.LocalDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java index a61ca485e..138be399e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java @@ -35,7 +35,7 @@ import java.util.List; import javax.validation.Valid; import javax.validation.constraints.AssertTrue; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.Days; import org.joda.time.LocalDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java index f2f1246c8..75850bcf6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java @@ -24,7 +24,7 @@ package org.libreplan.business.planner.entities; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.LogFactory; import org.apache.commons.math3.analysis.interpolation.SplineInterpolator; import org.apache.commons.math3.analysis.UnivariateFunction; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java index b99194167..cba2811c7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java @@ -37,7 +37,7 @@ import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.AssertTrue; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.Days; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java index 6dc146a05..02cda3cea 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java @@ -37,8 +37,8 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.validation.constraints.NotNull; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java index c0b53ae38..6e006af5f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java @@ -33,7 +33,7 @@ import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.AssertTrue; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.entities.ProgressType; import org.libreplan.business.orders.entities.TaskSource; import org.libreplan.business.resources.daos.IResourcesSearcher; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java index db724e8b6..4c299a2d7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java @@ -29,7 +29,7 @@ import java.util.Set; import javax.validation.constraints.AssertTrue; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.DateTime; import org.joda.time.Days; import org.libreplan.business.orders.entities.Order; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskPositionConstraint.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskPositionConstraint.java index b12bde999..4b1eb3814 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskPositionConstraint.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskPositionConstraint.java @@ -22,7 +22,7 @@ package org.libreplan.business.planner.entities; import java.util.Date; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.orders.entities.Order.SchedulingMode; import org.libreplan.business.workingday.IntraDayDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/Distributor.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/Distributor.java index 79b1c1f79..ffecf84ff 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/Distributor.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/Distributor.java @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.calendars.entities.Capacity; import org.libreplan.business.planner.entities.Share; import org.libreplan.business.planner.entities.ShareDivision; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/EffortModification.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/EffortModification.java index 8876d20f6..c4245da76 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/EffortModification.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/EffortModification.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.GenericResourceAllocation; import org.libreplan.business.planner.entities.ResourceAllocation; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java index 5f299992f..abb1b3b2b 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.planner.entities.ResourceAllocation; import org.libreplan.business.workingday.ResourcesPerDay; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java index 9ed8ab21e..3a18dab68 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.AvailabilityTimeLine; import org.libreplan.business.calendars.entities.CombinedWorkHours; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java index 0d83f90b5..3739c33ff 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.ICalendar; import org.libreplan.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator.CapacityResult; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/AllocationSpec.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/AllocationSpec.java index f47e11fbe..8017366a4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/AllocationSpec.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/AllocationSpec.java @@ -23,7 +23,7 @@ package org.libreplan.business.planner.limiting.entities; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.DayAssignment; import org.libreplan.business.planner.entities.GenericDayAssignment; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/DateAndHour.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/DateAndHour.java index 8a5f92925..5f7586469 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/DateAndHour.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/DateAndHour.java @@ -25,10 +25,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.libreplan.business.workingday.EffortDuration; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/Gap.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/Gap.java index d5282b0e5..7f8b877b8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/Gap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/Gap.java @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.AvailabilityTimeLine; import org.libreplan.business.calendars.entities.AvailabilityTimeLine.DatePoint; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/InsertionRequirements.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/InsertionRequirements.java index 5be82c920..9d99b2604 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/InsertionRequirements.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/InsertionRequirements.java @@ -25,7 +25,7 @@ import java.util.Date; import java.util.List; import java.util.ListIterator; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.Dependency; import org.libreplan.business.planner.entities.Task; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java index fab63e41c..64fabb575 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java @@ -24,7 +24,7 @@ import static org.libreplan.business.i18n.I18nHelper._; import java.util.EnumMap; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.planner.entities.Dependency; import org.libreplan.business.planner.entities.Dependency.Type; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueElement.java index c6d958b1a..6988c2071 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueElement.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.Valid; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java index 1a0cf6f9d..514c555d4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java @@ -23,7 +23,7 @@ package org.libreplan.business.planner.limiting.entities; import static org.libreplan.business.i18n.I18nHelper._; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; /** diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/daos/QualityFormDAO.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/daos/QualityFormDAO.java index 254a09921..d1e88e556 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/daos/QualityFormDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/daos/QualityFormDAO.java @@ -25,7 +25,7 @@ import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.NonUniqueResultException; import org.hibernate.Query; diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java index 3f02d73b6..a9c6ff8f3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java @@ -30,8 +30,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.NonUniqueResultException; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java index a1335d6a7..005a28a8a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import javax.validation.Valid; diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java index c0b1e49a5..45e970794 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java @@ -27,7 +27,7 @@ import java.util.Date; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.validator.constraints.NotEmpty; import org.libreplan.business.INewObject; diff --git a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/Util.java b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/Util.java index 3657c7394..c9a0007e3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/Util.java +++ b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/Util.java @@ -22,7 +22,7 @@ package org.libreplan.business.reports.dtos; import java.math.BigDecimal; import java.math.RoundingMode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.trees.ITreeNode; /** diff --git a/libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java b/libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java index 4626e603c..cad0a817a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java @@ -21,7 +21,7 @@ package org.libreplan.business.requirements.entities; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import javax.validation.constraints.NotNull; import org.libreplan.business.orders.entities.HoursGroup; import org.libreplan.business.orders.entities.OrderElement; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionDAO.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionDAO.java index ae4a717ef..795739506 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionDAO.java @@ -24,7 +24,7 @@ package org.libreplan.business.resources.daos; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionTypeDAO.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionTypeDAO.java index e1ac91097..1b6accf04 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionTypeDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionTypeDAO.java @@ -24,7 +24,7 @@ package org.libreplan.business.resources.daos; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.criterion.Order; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourcesSearcher.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourcesSearcher.java index 221b9cd70..1363180bc 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourcesSearcher.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourcesSearcher.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java index 19c6d427e..2977fe679 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java @@ -32,9 +32,9 @@ import java.util.List; import java.util.Set; import org.apache.commons.collections.ComparatorUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java index 38621d330..7d7c3f923 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java @@ -23,9 +23,9 @@ package org.libreplan.business.resources.entities; import java.util.Comparator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import org.joda.time.LocalDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java index 83b72efc5..8f2303b30 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java @@ -32,8 +32,8 @@ import javax.validation.Valid; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; -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.hibernate.validator.constraints.NotEmpty; import org.libreplan.business.advance.entities.AdvanceAssignment; import org.libreplan.business.common.IHumanIdentifiable; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionTypeBase.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionTypeBase.java index e22e1837a..d8ac1170c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionTypeBase.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionTypeBase.java @@ -21,7 +21,7 @@ package org.libreplan.business.resources.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Base implementation of {@link ICriterionType}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionWithItsType.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionWithItsType.java index 55d2151dc..6b1243495 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionWithItsType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionWithItsType.java @@ -21,7 +21,7 @@ package org.libreplan.business.resources.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * A {@link ICriterion} with his associated {@link ICriterionType}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Interval.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Interval.java index 804fd777b..9c1e3d258 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Interval.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Interval.java @@ -22,8 +22,8 @@ package org.libreplan.business.resources.entities; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.joda.time.LocalDate; /** diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java index b3969c045..5597eca67 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.Valid; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java index 2cea4e0ab..af4e513e4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java @@ -40,8 +40,8 @@ import javax.validation.Valid; import javax.validation.constraints.AssertFalse; import javax.validation.constraints.AssertTrue; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.AvailabilityTimeLine; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java index b50a00ee5..7a25c20c8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java @@ -22,7 +22,7 @@ package org.libreplan.business.resources.entities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.Valid; diff --git a/libreplan-business/src/main/java/org/libreplan/business/scenarios/daos/ScenarioDAO.java b/libreplan-business/src/main/java/org/libreplan/business/scenarios/daos/ScenarioDAO.java index 8656399c4..d052e6984 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/scenarios/daos/ScenarioDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/scenarios/daos/ScenarioDAO.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.libreplan.business.common.daos.GenericDAOHibernate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/OrderVersion.java b/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/OrderVersion.java index e7959b66e..975780630 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/OrderVersion.java +++ b/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/OrderVersion.java @@ -21,7 +21,7 @@ package org.libreplan.business.scenarios.entities; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import org.joda.time.DateTime; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java b/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java index facf4625d..b3be78f7c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java +++ b/libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.Objects; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; import org.joda.time.DateTime; @@ -90,7 +90,7 @@ public class Scenario extends BaseEntity implements IHumanIdentifiable { Iterator iterator = orders.values().iterator(); while (iterator.hasNext()) { OrderVersion each = iterator.next(); - if (ObjectUtils.equals(orderVersion, each)) { + if (Objects.equals(orderVersion, each)) { iterator.remove(); } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/daos/OrderElementTemplateDAO.java b/libreplan-business/src/main/java/org/libreplan/business/templates/daos/OrderElementTemplateDAO.java index aebef4db0..d0ca20680 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/templates/daos/OrderElementTemplateDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/templates/daos/OrderElementTemplateDAO.java @@ -22,7 +22,7 @@ package org.libreplan.business.templates.daos; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.NonUniqueResultException; import org.hibernate.Query; import org.libreplan.business.common.daos.GenericDAOHibernate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java index b48f5d490..34de59ba7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.NonUniqueResultException; diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java index 73691a653..1cba6d221 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java @@ -30,7 +30,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.NotNull; import javax.validation.Valid; import org.libreplan.business.orders.entities.HoursGroup; diff --git a/libreplan-business/src/main/java/org/libreplan/business/trees/TreeNodeOnList.java b/libreplan-business/src/main/java/org/libreplan/business/trees/TreeNodeOnList.java index a352fdd8d..256d79024 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/trees/TreeNodeOnList.java +++ b/libreplan-business/src/main/java/org/libreplan/business/trees/TreeNodeOnList.java @@ -23,7 +23,7 @@ package org.libreplan.business.trees; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Implementation of {@link ITreeParentNode} that mutates a list
diff --git a/libreplan-business/src/main/java/org/libreplan/business/util/ListSorter.java b/libreplan-business/src/main/java/org/libreplan/business/util/ListSorter.java index f5306c393..d244330be 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/util/ListSorter.java +++ b/libreplan-business/src/main/java/org/libreplan/business/util/ListSorter.java @@ -28,7 +28,7 @@ import java.util.Comparator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * This class wraps a list that is kept sorted if and only if modify method is diff --git a/libreplan-business/src/main/java/org/libreplan/business/util/Pair.java b/libreplan-business/src/main/java/org/libreplan/business/util/Pair.java index 9eaca8b63..b0b3da3ba 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/util/Pair.java +++ b/libreplan-business/src/main/java/org/libreplan/business/util/Pair.java @@ -1,7 +1,7 @@ package org.libreplan.business.util; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; public class Pair { diff --git a/libreplan-business/src/main/java/org/libreplan/business/util/deepcopy/DeepCopy.java b/libreplan-business/src/main/java/org/libreplan/business/util/deepcopy/DeepCopy.java index 99b4e517d..ed8d82113 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/util/deepcopy/DeepCopy.java +++ b/libreplan-business/src/main/java/org/libreplan/business/util/deepcopy/DeepCopy.java @@ -38,7 +38,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.proxy.HibernateProxy; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workingday/EffortDuration.java b/libreplan-business/src/main/java/org/libreplan/business/workingday/EffortDuration.java index ff96373ad..95548ff89 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workingday/EffortDuration.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workingday/EffortDuration.java @@ -31,8 +31,8 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.Fraction; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.Fraction; /** *

diff --git a/libreplan-business/src/main/java/org/libreplan/business/workingday/IntraDayDate.java b/libreplan-business/src/main/java/org/libreplan/business/workingday/IntraDayDate.java index 217bc4461..24aa5a9ed 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workingday/IntraDayDate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workingday/IntraDayDate.java @@ -33,8 +33,8 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.HashCodeBuilder; import javax.validation.constraints.NotNull; import org.joda.time.DateTime; import org.joda.time.Days; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workingday/ResourcesPerDay.java b/libreplan-business/src/main/java/org/libreplan/business/workingday/ResourcesPerDay.java index d27a8b736..7eb33c822 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workingday/ResourcesPerDay.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workingday/ResourcesPerDay.java @@ -24,7 +24,7 @@ package org.libreplan.business.workingday; import java.math.BigDecimal; import java.math.RoundingMode; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.ProportionalDistributor; import org.libreplan.business.workingday.EffortDuration.Granularity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workingday/hibernate/EffortDurationType.java b/libreplan-business/src/main/java/org/libreplan/business/workingday/hibernate/EffortDurationType.java index 4ae3f7f23..6431edb9d 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workingday/hibernate/EffortDurationType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workingday/hibernate/EffortDurationType.java @@ -25,8 +25,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; +import java.util.Objects; -import org.apache.commons.lang.ObjectUtils; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.type.StandardBasicTypes; @@ -50,7 +50,7 @@ public class EffortDurationType implements UserType { @Override public boolean equals(Object x, Object y) throws HibernateException { - return ObjectUtils.equals(x, y); + return Objects.equals(x, y); } @Override diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/daos/WorkReportTypeDAO.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/daos/WorkReportTypeDAO.java index 99aa14259..00df90aeb 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/daos/WorkReportTypeDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/daos/WorkReportTypeDAO.java @@ -23,7 +23,7 @@ package org.libreplan.business.workreports.daos; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Criteria; import org.hibernate.NonUniqueResultException; import org.hibernate.criterion.Restrictions; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java index dd0d97448..6677c8fb3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java @@ -28,8 +28,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import javax.validation.Valid; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java index 87a3f8a4f..27998fd91 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.AssertTrue; import javax.validation.constraints.NotNull; import javax.validation.Valid; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java index 36ce1f2c3..8f284c903 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; import javax.validation.constraints.AssertTrue; import org.hibernate.validator.constraints.NotEmpty; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/AvailabilityTimeLineTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/AvailabilityTimeLineTest.java index de3db5bd0..73c7b47a8 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/AvailabilityTimeLineTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/AvailabilityTimeLineTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/BaseCalendarTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/BaseCalendarTest.java index 60fa88e39..b7463ac01 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/BaseCalendarTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/BaseCalendarTest.java @@ -777,7 +777,7 @@ public class BaseCalendarTest { ResourcesPerDay.amount(2)), equalTo(hours(16))); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void getCapacityWithOvertimeMustNotBeCalledWithANullDate() { BaseCalendar calendar = createBasicCalendar(); calendar.getCapacityWithOvertime(null); diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/CombinedWorkHoursTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/CombinedWorkHoursTest.java index f9c55f64b..1451216c5 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/CombinedWorkHoursTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/calendars/entities/CombinedWorkHoursTest.java @@ -39,7 +39,7 @@ import org.libreplan.business.workingday.IntraDayDate.PartialDay; public class CombinedWorkHoursTest { - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void cannotAcceptOnlyNullElements() { ICalendar[] nullWorkHours = null; CombinedWorkHours.minOf(nullWorkHours); diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/orders/daos/OrderElementDAOTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/orders/daos/OrderElementDAOTest.java index 680b5d3a3..45b4a4a36 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/orders/daos/OrderElementDAOTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/orders/daos/OrderElementDAOTest.java @@ -429,10 +429,8 @@ public class OrderElementDAOTest { @Test @Transactional public void testCheckUniqueQualityForm() { - OrderElement orderElement = OrderElementTest - .givenOrderLineGroupWithTwoOrderLines(2000, 3000); - QualityForm qualityForm = QualityForm.create(UUID.randomUUID() - .toString(), UUID.randomUUID().toString()); + OrderElement orderElement = OrderElementTest.givenOrderLineGroupWithTwoOrderLines(2000, 3000); + QualityForm qualityForm = QualityForm.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); orderElement.addTaskQualityForm(qualityForm); assertThat(orderElement.getTaskQualityForms().size(), equalTo(1)); @@ -440,7 +438,7 @@ public class OrderElementDAOTest { try { orderElement.addTaskQualityForm(null); fail("It should throw an exception"); - } catch (IllegalArgumentException e) { + } catch (NullPointerException e) { // ok } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/OrderElementTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/OrderElementTest.java index 07e4bb2be..57e3b56d3 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/OrderElementTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/OrderElementTest.java @@ -45,7 +45,7 @@ import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java index f0a6c9ee0..b25c024fb 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java @@ -7,8 +7,8 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; +import java.util.Objects; -import org.apache.commons.lang.ObjectUtils; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -72,7 +72,7 @@ public class ContiguousDaysLineTest { if (object instanceof ContiguousDaysLine) { ContiguousDaysLine line = (ContiguousDaysLine) object; for (OnDay each : line) { - if(! ObjectUtils.equals(value, each.getValue())){ + if(! Objects.equals(value, each.getValue())){ return false; } } @@ -179,7 +179,7 @@ public class ContiguousDaysLineTest { if (object instanceof ContiguousDaysLine) { ContiguousDaysLine another = (ContiguousDaysLine) object; for (OnDay each : line) { - if (!ObjectUtils.equals(each.getValue(), + if (!Objects.equals(each.getValue(), another.get(each.getDay()))) { return false; } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java index 9f89d5b5b..c5306f491 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java @@ -44,7 +44,7 @@ public class AggregateOfResourceAllocationsTest { private AggregateOfResourceAllocations aggregate; - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void doesntAcceptNullResourceAllocations() { AggregateOfResourceAllocations.createFromSatisfied(null); } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DependencyTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DependencyTest.java index 960324ef5..542cd3dbe 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DependencyTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DependencyTest.java @@ -75,7 +75,7 @@ public class DependencyTest { try { Dependency.create(origin, destination, type); fail("must send IllegalArgumentException"); - } catch (IllegalArgumentException e) { + } catch (NullPointerException e) { // ok } } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java index 6abe221d6..7101a7335 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java @@ -179,7 +179,7 @@ public class DerivedAllocationGeneratorTest { return dayAssignment; } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void derivedFromMustBeNotNull() { givenFinder(); givenConfigurationUnit(); @@ -187,7 +187,7 @@ public class DerivedAllocationGeneratorTest { DerivedAllocationGenerator.generate(derivedFrom, finder, configurationUnit, dayAssignments); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void finderMustBeNotNull() { givenDerivedFrom(); givenConfigurationUnit(); @@ -195,7 +195,7 @@ public class DerivedAllocationGeneratorTest { DerivedAllocationGenerator.generate(derivedFrom, finder, configurationUnit, dayAssignments); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void configurationUnitMustBeNotNull() { givenDerivedFrom(); givenFinder(); @@ -203,7 +203,7 @@ public class DerivedAllocationGeneratorTest { DerivedAllocationGenerator.generate(derivedFrom, finder, configurationUnit, dayAssignments); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void dayAssignmentsMustBeNotNull() { givenDerivedFrom(); givenFinder(); diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java index 87f27b339..1c931d387 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java @@ -148,13 +148,13 @@ public class DerivedAllocationTest { DerivedAllocation.create(derivedFrom, configurationUnit); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void theDerivedFromMustBeNotNull() { givenConfigurationUnit(); DerivedAllocation.create(derivedFrom, configurationUnit); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void theConfigurationUnitMustBeNotNull() { givenDerivedFrom(); DerivedAllocation.create(derivedFrom, configurationUnit); diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java index 5b45e3a9c..24ab094c8 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.easymock.IAnswer; import org.easymock.EasyMock; import org.joda.time.Interval; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/ShareDivisionTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/ShareDivisionTest.java index 88666a069..812dcc113 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/ShareDivisionTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/ShareDivisionTest.java @@ -61,7 +61,7 @@ public class ShareDivisionTest { return new Share(10); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void sharesCannotBeNull() { ShareDivision.create(null); } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java index c0846efd8..fbc174b10 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java @@ -291,7 +291,7 @@ public class StretchesFunctionTest { assertThat(interval.getStartFor(now), equalTo(now)); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void endDateCannotBeNull() { LocalDate start = new LocalDate().plusMonths(1); new Interval(new BigDecimal(0.3), start, null); diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskGroupTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskGroupTest.java index 82b627c94..94ccfc3c1 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskGroupTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskGroupTest.java @@ -82,7 +82,7 @@ public class TaskGroupTest { assertThat(child.getParent(), equalTo(taskGroup)); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void cantAddNullTaskElement() { taskGroup.addTaskElement(null); } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/qualityforms/entities/QualityFormTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/qualityforms/entities/QualityFormTest.java index 855a460f6..163592350 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/qualityforms/entities/QualityFormTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/qualityforms/entities/QualityFormTest.java @@ -81,9 +81,7 @@ public class QualityFormTest extends AbstractQualityFormTest { qualityForm.setQualityFormType(null); qualityFormDAO.save(qualityForm); fail("It should throw an exception"); - } catch (ValidationException e) { - // It should throw an exception - } catch (IllegalArgumentException e) { + } catch (ValidationException | NullPointerException e) { // It should throw an exception } } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/IntervalTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/IntervalTest.java index a06d98082..47bb6d801 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/IntervalTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/IntervalTest.java @@ -38,7 +38,7 @@ public class IntervalTest { CriterionSatisfactionDAOTest.year(1999)); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void testStartDateMustBeNotNull() { Interval.range(null, CriterionSatisfactionDAOTest.year(1999)); } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/ResourceTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/ResourceTest.java index 1e9d638df..698a04326 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/ResourceTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/ResourceTest.java @@ -396,7 +396,7 @@ public class ResourceTest { try { worker.addSatisfaction(criterionType, wrong); fail("must send exception"); - } catch (IllegalArgumentException e) { + } catch (NullPointerException | IllegalArgumentException e) { // ok } } @@ -514,7 +514,7 @@ public class ResourceTest { private Worker worker; private List assignments; - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) @Transactional public void addNewAssignmentsMustReceiveNotNullArgument() { givenWorker(); @@ -525,7 +525,7 @@ public class ResourceTest { @Transactional public void mustHaveNoNullElements() { givenWorker(); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(null); worker.addNewAssignments(list); } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/workingday/IntraDayDateTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/workingday/IntraDayDateTest.java index 67bc0a733..5bac10381 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/workingday/IntraDayDateTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/workingday/IntraDayDateTest.java @@ -60,12 +60,12 @@ public class IntraDayDateTest { private EffortDuration oneHour = EffortDuration.hours(1); private EffortDuration halfHour = EffortDuration.minutes(30); - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void needsANotNullDuration() { IntraDayDate.create(new LocalDate(), null); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void needsANotNullDate() { IntraDayDate.create(null, EffortDuration.elapsing(1, Granularity.HOURS)); } diff --git a/libreplan-business/src/test/java/org/libreplan/business/util/ListSorterTest.java b/libreplan-business/src/test/java/org/libreplan/business/util/ListSorterTest.java index 5b9524c32..2df925c85 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/util/ListSorterTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/util/ListSorterTest.java @@ -42,7 +42,7 @@ public class ListSorterTest { listSorter = ListSorter.create(initialElements); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void theInitialElementsMustBeNotNull() { ListSorter. create(null); } @@ -52,7 +52,7 @@ public class ListSorterTest { ListSorter.create(asList("A", "C", null)); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void theComparatorCannotBeNull() { ListSorter.create(Arrays.asList("A"), null); } @@ -106,12 +106,13 @@ public class ListSorterTest { listSorter.add(initialElements.get(0)); } - @Test(expected = IllegalArgumentException.class) + @Test(expected = NullPointerException.class) public void nullElementCannotBeAdded() { givenSortedList(); listSorter.add(null); } + @Test public void addInsertsAtRightPosition() { givenSortedList(); diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml index 22b80af51..5a6790a73 100644 --- a/libreplan-webapp/pom.xml +++ b/libreplan-webapp/pom.xml @@ -59,7 +59,7 @@ org.apache.maven.plugins maven-source-plugin - 2.1.2 + 3.0.0 default @@ -83,7 +83,7 @@ maven-antrun-plugin - 1.1 + 1.8 user-doc-generation @@ -251,7 +251,7 @@ org.apache.maven.plugins maven-antrun-plugin - [1.1,) + [1.8,) run @@ -275,9 +275,9 @@ - org.xnap.commons - maven-gettext-plugin - [1.2.0,) + com.googlecode.gettext-commons + gettext-maven-plugin + [1.2.4,) dist diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java b/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java index 54987566e..dc8f1a11d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java @@ -28,7 +28,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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java index 354188e24..f98db9057 100755 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java @@ -32,7 +32,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java index 4c82824a4..7800cf2e5 100755 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java @@ -27,7 +27,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import com.fasterxml.jackson.databind.DeserializationFeature; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.jaxrs.client.WebClient; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.libreplan.importers.jira.IssueDTO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java index fb3e68d6c..528557fdb 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java @@ -24,7 +24,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.common.daos.IConnectorDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConverter.java b/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConverter.java index d21920a88..a2758c3f8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConverter.java @@ -43,7 +43,7 @@ import net.sf.mpxj.Task; import net.sf.mpxj.TimeUnit; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.Period; import org.libreplan.importers.CalendarDayHoursDTO.CalendarDayDTO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java index 74197ca04..3d419cfbc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java @@ -30,7 +30,7 @@ import java.util.UUID; import net.sf.mpxj.reader.ProjectReader; import net.sf.mpxj.reader.ProjectReaderUtility; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.daos.IBaseCalendarDAO; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/SchedulerManager.java b/libreplan-webapp/src/main/java/org/libreplan/importers/SchedulerManager.java index ef1b49da0..20afacf42 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/SchedulerManager.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/SchedulerManager.java @@ -24,7 +24,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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.daos.IConnectorDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java index fbfd26f5d..d30d7a7cc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java @@ -26,7 +26,7 @@ import static org.libreplan.web.I18nHelper._; import java.math.BigDecimal; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.advance.daos.IAdvanceTypeDAO; import org.libreplan.business.advance.entities.AdvanceType; import org.libreplan.business.common.exceptions.InstanceNotFoundException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java index eda8a8001..2a7a17cab 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java @@ -25,7 +25,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java index 11c623946..1e783d22c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java @@ -36,7 +36,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.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.calendars.entities.CalendarAvailability; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java index 8f5ff7b9b..0c65af428 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.daos.IBaseCalendarDAO; import org.libreplan.business.calendars.daos.ICalendarExceptionTypeDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/ResourceCalendarModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/ResourceCalendarModel.java index 89b6bd3a0..f7baa3346 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/ResourceCalendarModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/ResourceCalendarModel.java @@ -21,7 +21,7 @@ package org.libreplan.web.calendars; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.calendars.entities.ResourceCalendar; import org.libreplan.business.common.daos.IConfigurationDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java index d9203150f..55f052caa 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java @@ -21,7 +21,7 @@ package org.libreplan.web.common; import static org.libreplan.web.I18nHelper._; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.IHumanIdentifiable; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java index 2eb95069b..c29bf5478 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java @@ -44,7 +44,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java index a6e79c914..2b3507486 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.calendars.daos.IBaseCalendarDAO; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.common.daos.IConfigurationDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ExceptionCatcherProxy.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ExceptionCatcherProxy.java index ee8819aba..cb96c0ca8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ExceptionCatcherProxy.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ExceptionCatcherProxy.java @@ -28,7 +28,7 @@ import java.lang.reflect.Proxy; import java.util.LinkedList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; public class ExceptionCatcherProxy { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java index 0199cdacb..d2aec0388 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java @@ -27,7 +27,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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.entities.Connector; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/MessagesForUser.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/MessagesForUser.java index 0b31b3702..4bac68674 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/MessagesForUser.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/MessagesForUser.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.exceptions.ValidationException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/OnTabSelection.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/OnTabSelection.java index 6b926a930..c3b42e507 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/OnTabSelection.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/OnTabSelection.java @@ -23,7 +23,7 @@ package org.libreplan.web.common; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java index 431ae16b7..0a0a36cdf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.common.IOnTransaction; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModelAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModelAdapter.java index bca4b73b1..29f7f6e63 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModelAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModelAdapter.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.TaskElement; import org.libreplan.business.planner.entities.TaskElement.IDatesHandler; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/Autocomplete.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/Autocomplete.java index 10c799626..597fe7d71 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/Autocomplete.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/Autocomplete.java @@ -26,7 +26,7 @@ import java.util.List; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.web.common.components.finders.IFinder; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/CapacityPicker.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/CapacityPicker.java index 399b2b5d4..b80b384c3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/CapacityPicker.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/CapacityPicker.java @@ -18,7 +18,7 @@ */ package org.libreplan.web.common.components; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.libreplan.business.calendars.entities.Capacity; import org.libreplan.business.workingday.EffortDuration; import org.libreplan.web.common.Util; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewDataSortableColumn.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewDataSortableColumn.java index 8bc004d85..93d962b00 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewDataSortableColumn.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewDataSortableColumn.java @@ -24,7 +24,7 @@ package org.libreplan.web.common.components; import java.util.Comparator; import org.apache.commons.collections4.comparators.BooleanComparator; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.INewObject; import org.zkoss.zk.ui.ext.AfterCompose; import org.zkoss.zul.Column; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java index 4b701ba14..4682e72d0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java @@ -30,7 +30,7 @@ import java.util.NoSuchElementException; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.web.common.components.finders.FilterPair; import org.libreplan.web.common.components.finders.IMultipleFiltersFinder; import org.springframework.web.context.WebApplicationContext; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxSearch.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxSearch.java index c1f61da54..47c1de537 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxSearch.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxSearch.java @@ -29,7 +29,7 @@ import java.util.List; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.labels.entities.Label; import org.libreplan.web.common.Util; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionMultipleFiltersFinder.java index f5955588f..97882cac6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionMultipleFiltersFinder.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.CriterionType; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/FilterPair.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/FilterPair.java index 947b3d670..8038dc0d9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/FilterPair.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/FilterPair.java @@ -21,7 +21,7 @@ package org.libreplan.web.common.components.finders; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Susana Montes Pedreira diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/MultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/MultipleFiltersFinder.java index 938a03d09..356903235 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/MultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/MultipleFiltersFinder.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.AdHocTransactionService; import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.hibernate.notification.ISnapshotRefresherService; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java index d0eae3b9e..ea98854bf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.labels.entities.LabelType; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java index 7a7957d59..dd74a5c79 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.labels.entities.Label; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java index 0cc1b2e2f..bc8aabbaf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.CriterionType; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceBandboxFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceBandboxFinder.java index 41d2b4f09..527bf271c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceBandboxFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceBandboxFinder.java @@ -21,7 +21,7 @@ package org.libreplan.web.common.components.finders; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.resources.daos.IResourceDAO; import org.libreplan.business.resources.entities.Resource; import org.springframework.beans.factory.annotation.Autowired; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java index 82b93706f..123360899 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.CriterionType; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourcesMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourcesMultipleFiltersFinder.java index 25579c12c..66934f7a1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourcesMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourcesMultipleFiltersFinder.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.costcategories.entities.CostCategory; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.resources.entities.Criterion; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java index 8aa7efc75..bb092e9bf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.labels.entities.LabelType; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java index 71cbeaba7..c27a3ba37 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots; import org.libreplan.business.labels.entities.Label; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TypeOfWorkHoursBandboxFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TypeOfWorkHoursBandboxFinder.java index 4d35bddc7..13a0cea06 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TypeOfWorkHoursBandboxFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TypeOfWorkHoursBandboxFinder.java @@ -21,7 +21,7 @@ package org.libreplan.web.common.components.finders; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.costcategories.daos.ITypeOfWorkHoursDAO; import org.libreplan.business.costcategories.entities.TypeOfWorkHours; import org.springframework.beans.factory.annotation.Autowired; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java index 8f9070662..3854da180 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java @@ -21,7 +21,7 @@ package org.libreplan.web.common.components.finders; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.users.daos.IUserDAO; import org.libreplan.business.users.entities.User; import org.springframework.beans.factory.annotation.Autowired; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java index e2a586442..b02824f9d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java @@ -36,7 +36,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.web.common.Util; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryModel.java index 691e530ed..360d44c62 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryModel.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.common.entities.EntityNameEnum; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java index 1d4e29418..cc5a48d15 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java @@ -29,7 +29,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.zkoss.zk.ui.util.Clients; /** diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java index 3f0785c2f..fd3557268 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.calendars.daos.ICalendarExceptionTypeDAO; import org.libreplan.business.calendars.entities.CalendarExceptionType; import org.libreplan.business.common.IntegrationEntity; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java index fbc395581..c099636f4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.LogFactory; import org.hibernate.Hibernate; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyModel.java index a5244410f..9cd7ff788 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyModel.java @@ -23,7 +23,7 @@ package org.libreplan.web.externalcompanies; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.externalcompanies.daos.IExternalCompanyDAO; import org.libreplan.business.externalcompanies.entities.ExternalCompany; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java index 39c74fb15..588979c35 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.common.entities.EntityNameEnum; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingDependencyComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingDependencyComponent.java index 5b1b84291..0905c69f7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingDependencyComponent.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingDependencyComponent.java @@ -23,7 +23,7 @@ package org.libreplan.web.limitingresources; import java.io.IOException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.zkoss.ganttz.data.DependencyType; import org.zkoss.zk.au.out.AuInvoke; import org.zkoss.zk.ui.sys.ContentRenderer; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourceQueueModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourceQueueModel.java index 1bb5a1dbf..ade48bdf8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourceQueueModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourceQueueModel.java @@ -36,7 +36,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.SortedSet; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Hibernate; import org.hibernate.proxy.HibernateProxy; import org.jgrapht.DirectedGraph; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java index 38cc2ddf0..b29b5b97b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java @@ -30,8 +30,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.common.IOnTransaction; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesPanel.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesPanel.java index 6bdd3db9a..c583bdc78 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesPanel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesPanel.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.Period; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java index ba7eac2ea..b13a208a1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.ResourceAllocation; import org.libreplan.business.planner.limiting.entities.DateAndHour; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTask.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTask.java index 5f724dcfc..76c39314c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTask.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTask.java @@ -21,8 +21,8 @@ package org.libreplan.web.limitingresources; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTaskGenerator.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTaskGenerator.java index 39abdf75b..1b22de560 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTaskGenerator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueTaskGenerator.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueuesState.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueuesState.java index 9f66f5d7a..6f2d07694 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueuesState.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueuesState.java @@ -31,9 +31,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.jgrapht.DirectedGraph; import org.jgrapht.alg.CycleDetector; import org.jgrapht.graph.DirectedMultigraph; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java index 7b0110fa6..b2218f17b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.common.entities.EntityNameEnum; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java index f08c9549e..df37fdc4c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java @@ -25,7 +25,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.ConcurrentModificationException; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java index ec8d0ae1c..c5c946c5e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IConfigurationDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java index 4d6cd2c4e..7c19f1f07 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java @@ -35,8 +35,8 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.Hibernate; import org.joda.time.LocalDate; import org.libreplan.business.orders.entities.Order; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloTask.java b/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloTask.java index 63f0f42d5..5007fd10c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloTask.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloTask.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.Days; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java index 2573bfaec..855bd0f4e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java @@ -28,7 +28,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.common.Registry; import org.libreplan.business.common.daos.ConfigurationDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java index 055e8c9b9..c564902e2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java @@ -28,7 +28,7 @@ import java.text.ParseException; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.web.common.Util; import org.zkoss.ganttz.util.ComponentsFinder; import org.zkoss.util.Locales; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java index aa7da83c4..1f2dd79fc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java @@ -38,7 +38,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java index c8a839abf..7a6313e9a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java @@ -37,7 +37,7 @@ import java.util.TreeSet; import javax.annotation.Resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java index bc392f852..51a5d77e6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java @@ -23,7 +23,7 @@ package org.libreplan.web.orders; import static org.libreplan.web.I18nHelper._; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.orders.entities.OrderLine; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java index a7c2ef3f2..0ee2d409b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java @@ -25,7 +25,7 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.entities.HoursGroup; import org.libreplan.business.orders.entities.OrderElement; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index a005e6035..b771df680 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -35,7 +35,7 @@ import java.util.Set; import javax.annotation.Resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.common.daos.IConnectorDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java index 15678b31c..7e761cea7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.advance.entities.AdvanceMeasurement; import org.libreplan.business.advance.entities.DirectAdvanceAssignment; import org.libreplan.business.advance.entities.IndirectAdvanceAssignment; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderPredicate.java index 9f056fa46..1847540db 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderPredicate.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderPredicate.java @@ -24,7 +24,7 @@ package org.libreplan.web.orders; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.entities.Order; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/SchedulingStateToggler.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/SchedulingStateToggler.java index f4ab8aa54..986ca0400 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/SchedulingStateToggler.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/SchedulingStateToggler.java @@ -19,7 +19,7 @@ * along with this program. If not, see . */ package org.libreplan.web.orders; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.orders.entities.SchedulingState; import org.libreplan.business.orders.entities.SchedulingState.ITypeChangedListener; import org.libreplan.business.orders.entities.SchedulingState.Type; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java index da77e2fa2..b50f5dfac 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.LogFactory; import org.libreplan.business.orders.entities.HoursGroup; import org.libreplan.business.orders.entities.OrderElement; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/LabelsOnConversation.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/LabelsOnConversation.java index 15201a458..98b580262 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/LabelsOnConversation.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/LabelsOnConversation.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.labels.daos.ILabelDAO; import org.libreplan.business.labels.entities.Label; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index f058efce3..e4b2d824b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -39,11 +39,9 @@ import java.util.Arrays; import java.util.ArrayList; import java.util.HashSet; - - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.Fraction; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.Fraction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.Days; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java index 0bc3de0e3..d5acb4c80 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.planner.entities.GenericResourceAllocation; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java index b1d44a1b4..d9bd0eda5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.entities.Order; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java index f45a25307..a3d4de948 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java @@ -36,8 +36,8 @@ import java.util.Map.Entry; import java.util.WeakHashMap; import java.util.concurrent.Callable; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.Period; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationConfiguration.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationConfiguration.java index 3c13cf7a9..524d5a49b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationConfiguration.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationConfiguration.java @@ -21,7 +21,7 @@ package org.libreplan.web.planner.allocation; import java.util.Arrays; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.planner.entities.CalculatedValue; import org.libreplan.web.planner.allocation.ResourceAllocationController.CalculationTypeRadio; import org.zkoss.zk.ui.HtmlMacroComponent; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationResult.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationResult.java index beb356dd9..7bec3583d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationResult.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationResult.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.AggregateOfResourceAllocations; import org.libreplan.business.planner.entities.CalculatedValue; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java index 0e3d00f01..f9c0adb32 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.calendars.entities.AvailabilityTimeLine; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java index 2e90e79f8..6af8ee40a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java @@ -36,8 +36,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java index 126052867..c8ed1146e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java @@ -30,7 +30,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.planner.entities.CalculatedValue; import org.libreplan.business.planner.entities.GenericResourceAllocation; import org.libreplan.business.planner.entities.ResourceAllocation; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java index c660dc69e..ffd93e9eb 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java index fc51c414b..8ddfe67d3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java @@ -28,7 +28,7 @@ import java.math.RoundingMode; import java.util.Date; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.planner.entities.AssignmentFunction; import org.libreplan.business.planner.entities.ResourceAllocation; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/Chart.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/Chart.java index f96699ad3..28f7c8111 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/Chart.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/Chart.java @@ -20,7 +20,7 @@ */ package org.libreplan.web.planner.chart; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.zkforge.timeplot.Timeplot; import org.zkoss.ganttz.timetracker.TimeTracker; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java index 131e1c45c..5ae5af0bd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.common.entities.ProgressType; import org.libreplan.business.planner.entities.TaskElement; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingAllocationRow.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingAllocationRow.java index 03f1398a8..6d29625d8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingAllocationRow.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingAllocationRow.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.libreplan.business.planner.entities.GenericResourceAllocation; import org.libreplan.business.planner.entities.ResourceAllocation; import org.libreplan.business.planner.entities.SpecificResourceAllocation; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/BankHolidaysMarker.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/BankHolidaysMarker.java index 90ee99857..a69b45e62 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/BankHolidaysMarker.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/BankHolidaysMarker.java @@ -20,7 +20,7 @@ */ package org.libreplan.web.planner.order; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.calendars.entities.ICalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java index 914118d6c..1bc13a59b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.planner.entities.TaskElement; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java index 1a0cf8ab1..21b564356 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java index f7ae2aa5a..aef16d723 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java @@ -28,8 +28,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.Hibernate; import org.joda.time.LocalDate; import org.libreplan.business.advance.entities.DirectAdvanceAssignment; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java index 5d8671413..4e256723e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.Callable; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.common.IOnTransaction; import org.libreplan.business.planner.daos.ITaskElementDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignConfiguration.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignConfiguration.java index e17a51a3d..595da30ac 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignConfiguration.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignConfiguration.java @@ -23,7 +23,7 @@ package org.libreplan.web.planner.reassign; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.workingday.IntraDayDate; import org.libreplan.web.planner.TaskElementAdapter; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java index 2c6653dbe..b2bdb4b53 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; import org.libreplan.business.common.IAdHocTransactionService; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java index ebba95f83..42433c493 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java @@ -20,7 +20,7 @@ */ package org.libreplan.web.planner.tabs; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.zkoss.ganttz.extensions.ITab; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Desktop; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/Mode.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/Mode.java index 42b1c2497..1b3fe6532 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/Mode.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/Mode.java @@ -23,7 +23,7 @@ package org.libreplan.web.planner.tabs; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.orders.entities.Order; import org.zkoss.ganttz.TabsRegistry; import org.zkoss.ganttz.TabsRegistry.IBeforeShowAction; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java index 04f916414..8727279c0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.planner.entities.TaskElement; import org.libreplan.business.resources.daos.IResourcesSearcher; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java index acb408f27..a95da6dd1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java @@ -23,7 +23,7 @@ package org.libreplan.web.planner.tabs; import java.util.Collection; import java.util.EnumMap; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.web.planner.tabs.Mode.ModeTypeChangedListener; import org.zkoss.ganttz.extensions.ITab; import org.zkoss.zk.ui.Component; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java index 4b3b57e96..df6551cc4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java @@ -21,7 +21,7 @@ package org.libreplan.web.planner.taskedition; import static org.libreplan.web.I18nHelper._; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.planner.entities.AggregateOfResourceAllocations; import org.libreplan.business.planner.entities.CalculatedValue; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java b/libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java index 5ec803bf2..1a0ea85d3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java @@ -41,7 +41,7 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.UriBuilder; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.orders.entities.Order; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java index 11d2b53a5..b6de422d0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java @@ -25,7 +25,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.qualityforms.daos.IQualityFormDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java index 8ffe41f44..b0e27676f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java @@ -27,7 +27,7 @@ import java.util.Map; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRParameter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.Registry; import org.zkoss.util.Locales; import org.zkoss.zk.au.out.AuDownload; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java index dac3c0b50..1e38bcfec 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java @@ -31,7 +31,7 @@ import java.util.Map; import net.sf.jasperreports.engine.JRDataSource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.advance.entities.AdvanceType; import org.libreplan.business.orders.entities.Order; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/LoadPeriodGenerator.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/LoadPeriodGenerator.java index 98ad36b5b..a31fcddd5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/LoadPeriodGenerator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/LoadPeriodGenerator.java @@ -30,8 +30,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.Fraction; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.Fraction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.calendars.entities.ICalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java index 2d3aa0e29..f39d8575c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java @@ -30,8 +30,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.common.BaseEntity; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadDisplayData.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadDisplayData.java index 4c5efc48d..2c88e7384 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadDisplayData.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadDisplayData.java @@ -3,7 +3,7 @@ package org.libreplan.web.resourceload; import java.util.List; import java.util.concurrent.Callable; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.common.BaseEntity; import org.libreplan.business.planner.entities.DayAssignment; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java index e19cffc6a..d75efc574 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.Callable; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.resources.entities.Criterion; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionDTO.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionDTO.java index b1705c1b5..5c5bc5da3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionDTO.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionDTO.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.CriterionType; /** diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java index e17f9e698..bb82468b4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.common.exceptions.ValidationException.InvalidValue; import org.libreplan.business.costcategories.entities.CostCategory; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java index c73c0bb3f..708b6090d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.IntegrationEntity; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java index 3b11c5bb0..e22c2a82b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.calendars.daos.IBaseCalendarDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java index bf76254f5..a37dd86e3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.common.IOnTransaction; import org.libreplan.business.resources.daos.IResourceLoadRatiosCalculator.ILoadRatiosDataType; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/LocalizationsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/LocalizationsController.java index 9dea39a2d..c021443b3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/LocalizationsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/LocalizationsController.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.CriterionSatisfaction; import org.libreplan.web.common.Util; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java index 54841763e..68be46db2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java @@ -31,7 +31,7 @@ import java.util.Set; import javax.annotation.Resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.calendars.entities.ResourceCalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java index f46587c83..2845800ed 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; import org.libreplan.business.calendars.daos.IBaseCalendarDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java index a1d21d61d..f8b2d9212 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java @@ -27,7 +27,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.orders.daos.IOrderDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderElementsOnConversation.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderElementsOnConversation.java index 944d0bb7e..32a739411 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderElementsOnConversation.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderElementsOnConversation.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.daos.IOrderElementDAO; import org.libreplan.business.orders.entities.OrderElement; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java index af9fe3082..407f3a48c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java @@ -24,7 +24,7 @@ import static org.libreplan.web.I18nHelper._; import java.math.BigDecimal; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.orders.entities.SchedulingState; import org.libreplan.business.templates.entities.OrderElementTemplate; import org.libreplan.business.templates.entities.OrderLineTemplate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java index 0714ed842..7b00b436a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java @@ -24,7 +24,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.trees.ITreeNode; import org.libreplan.web.orders.OrderElementTreeController; import org.zkoss.zk.ui.HtmlMacroComponent; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java index 0d93f7ebb..aaed92e51 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java @@ -37,7 +37,7 @@ import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.orders.entities.SchedulingState; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java index a78e8c38c..b6faaca0c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java @@ -24,7 +24,7 @@ package org.libreplan.web.users; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.Configuration; import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.common.exceptions.InstanceNotFoundException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java index 217e2b862..7193b5294 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java @@ -31,7 +31,7 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.users.entities.UserRole; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java index af3e7fa68..c910706d0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java @@ -21,7 +21,7 @@ package org.libreplan.web.users.dashboard; import static org.libreplan.web.I18nHelper._; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.common.Registry; import org.libreplan.web.common.IMessagesForUser; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/CustomUser.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/CustomUser.java index e106ddcf5..770bb46f2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/CustomUser.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/CustomUser.java @@ -23,7 +23,7 @@ package org.libreplan.web.users.services; import java.util.Collection; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.scenarios.entities.Scenario; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java index 4b6cc82e3..5b61c5c16 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java @@ -27,7 +27,7 @@ import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.IAdHocTransactionService; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java index 6a7465645..3e54c8f6b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java @@ -21,7 +21,7 @@ package org.libreplan.web.users.settings; import static org.libreplan.web.I18nHelper._; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.web.UserUtil; import org.libreplan.web.common.ConstraintChecker; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java index a9970c2cb..ea9ba8acc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java @@ -22,7 +22,7 @@ package org.libreplan.web.users.settings; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.labels.daos.ILabelDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java index 68a1f8b38..30950ea90 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -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.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; import org.libreplan.business.common.exceptions.ValidationException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java index a90b86bec..3d41f8965 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Hibernate; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IConfigurationDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java index b8e1dbb71..d040c39f1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.NonUniqueResultException; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IConfigurationDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java index 9303b94b5..2c127817d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java @@ -32,7 +32,7 @@ import java.util.Set; import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.calendars.entities.CalendarData; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java index d8921ef36..e65863345 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java @@ -33,7 +33,7 @@ import java.util.UUID; import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.joda.time.LocalDate; import org.libreplan.business.advance.entities.AdvanceMeasurement; import org.libreplan.business.advance.entities.DirectAdvanceAssignment; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java index e5940ed9f..9036a2279 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java @@ -26,7 +26,7 @@ import java.util.Set; import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.common.Registry; import org.libreplan.business.common.exceptions.InstanceNotFoundException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetConverter.java index 79f754cde..4a4e2897f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetConverter.java @@ -26,7 +26,7 @@ import java.util.List; import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDate; import org.libreplan.business.common.Registry; import org.libreplan.business.common.exceptions.InstanceNotFoundException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java index 8337fd0b4..3147b3fa1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java @@ -25,7 +25,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.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.labels.entities.Label; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java index 4276bcabb..a0d63c59b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.Registry; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java index dc1aa78a5..0c1afe277 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.resources.entities.Criterion; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java index 22d7d34e4..06e3ad86b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.calendars.entities.CalendarAvailability; import org.libreplan.business.calendars.entities.ResourceCalendar; import org.libreplan.business.common.exceptions.InstanceNotFoundException; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java index 26bb30d90..aff511a42 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java @@ -33,7 +33,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.IntegrationEntity; import org.libreplan.business.common.daos.IEntitySequenceDAO; import org.libreplan.business.common.daos.IIntegrationEntityDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java index 5716d824f..bc6dd8730 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java @@ -35,7 +35,7 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.advance.bootstrap.PredefinedAdvancedTypes; import org.libreplan.business.advance.entities.AdvanceAssignment; import org.libreplan.business.advance.entities.AdvanceMeasurement; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java index 8be015131..93153bae5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java @@ -32,8 +32,8 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.NonUniqueResultException; import org.joda.time.LocalDate; import org.libreplan.business.calendars.entities.BaseCalendar; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/typeofworkhours/impl/TypeOfWorkHoursConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/typeofworkhours/impl/TypeOfWorkHoursConverter.java index 7ab42a565..e73ccf591 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/typeofworkhours/impl/TypeOfWorkHoursConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/typeofworkhours/impl/TypeOfWorkHoursConverter.java @@ -21,7 +21,7 @@ package org.libreplan.ws.typeofworkhours.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.costcategories.entities.TypeOfWorkHours; import org.libreplan.ws.typeofworkhours.api.TypeOfWorkHoursDTO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/unittypes/impl/UnitTypeConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/unittypes/impl/UnitTypeConverter.java index d78bb824a..75d6cfe85 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/unittypes/impl/UnitTypeConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/unittypes/impl/UnitTypeConverter.java @@ -21,7 +21,7 @@ package org.libreplan.ws.unittypes.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.materials.entities.UnitType; import org.libreplan.ws.unittypes.api.UnitTypeDTO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java index 8c641db85..0fa74320b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java @@ -28,8 +28,8 @@ import java.util.Set; import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.libreplan.business.common.Registry; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; diff --git a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java index bdf8527c2..3368a35ec 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java @@ -29,7 +29,7 @@ import java.util.Properties; import javax.ws.rs.ProcessingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Ignore; import org.junit.Test;