RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update imports, update pom files in libreplan-webapp/libreplan-business and change test for libs

Browse source 
Update imports, update pom files in libreplan-webapp/libreplan-business and change test for libs

Update imports, update pom files in libreplan-webapp/libreplan-business and change test for libs
This commit is contained in:
Bogdan Bodnarjuk 2016-05-06 18:22:41 +03:00 • committed by skylow95
parent 53f91ac8dc
commit 9e8fa1cf60
290 changed files with 377 additions and 379 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS.rst
View file

@ -56,6 +56,7 @@ Changes
* Update EasyMock
* Update JDBC driver
* Update Сommons-IO
* Update AspectJ Weaver
* Update LibrePlan version to 1.6.0

11
libreplan-business/pom.xml
View file

@ -131,9 +131,8 @@
<artifactId>liquibase-maven-plugin</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.5</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@ -150,7 +149,7 @@
<plugin>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<version>2.0.5</version>
<version>3.5.0</version>
<executions>
<execution>
<phase>process-resources</phase>
@ -179,7 +178,7 @@
<plugin>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<version>2.0.5</version>
<version>3.5.0</version>
<executions>
<execution>
<phase>process-resources</phase>
@ -222,7 +221,7 @@
<pluginExecutionFilter>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<versionRange>[2.0.5,)</versionRange>
<versionRange>[3.5.0,)</versionRange>
<goals>
<goal>update</goal>
</goals>

2
libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignmentTemplate.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/calendars/daos/CalendarExceptionTypeDAO.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/AvailabilityTimeLine.java
View file

@ -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;
/**

8
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java
View file

@ -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());
}

2
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarException.java
View file

@ -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;

6
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java
View file

@ -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;

6
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CombinedWorkHours.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/SameWorkHoursEveryDay.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/Configuration.java
View file

@ -20,7 +20,7 @@
package org.libreplan.business.common;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang3.BooleanUtils;
/**

2
libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/daos/GenericDAOHibernate.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/daos/IntegrationEntityDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/common/exceptions/ValidationException.java
View file

@ -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;
/**

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/CostCategoryDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java
View file

@ -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<ExpenseSheetLine> expenseSheetLines = new TreeSet<ExpenseSheetLine>(
private SortedSet<ExpenseSheetLine> expenseSheetLines = new TreeSet<>(
new ExpenseSheetLineComparator());
private Integer lastExpenseSheetLineSequenceCode = 0;

2
libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/hibernate/notification/NotBlockingAutoUpdatedSnapshot.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelTypeDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/materials/daos/MaterialCategoryDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/materials/daos/UnitTypeDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/orders/daos/HoursGroupDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
View file

@ -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;

6
libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderElementDAO.java
View file

@ -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<OrderElement>
if (order1 == null || order2 == null) {
return false;
}
return ObjectUtils.equals(order1.getId(), order2.getId());
return Objects.equals(order1.getId(), order2.getId());
}
}

6
libreplan-business/src/main/java/org/libreplan/business/orders/entities/AggregatedHoursGroup.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java
View file

@ -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;

7
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
View file

@ -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<OrderElement> {
public abstract class
OrderElement extends IntegrationEntity implements ICriterionRequirable, ITreeNode<OrderElement> {
protected InfoComponentWithCode infoComponent = new InfoComponentWithCode();

2
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingDataForVersion.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java
View file

@ -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 <ogonzalez@igalia.com>
*

2
libreplan-business/src/main/java/org/libreplan/business/orders/entities/SumChargedEffort.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/planner/daos/ResourceAllocationDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfDayAssignments.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/AggregateOfResourceAllocations.java
View file

@ -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;

6
libreplan-business/src/main/java/org/libreplan/business/planner/entities/DayAssignment.java
View file

@ -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<T> dayAssignments) {
List<T> result = new ArrayList<T>();
for (T each : dayAssignments) {
if (ObjectUtils.equals(each.getScenario(), scenario)) {
if (Objects.equals(each.getScenario(), scenario)) {
result.add(each);
}
}

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/Dependency.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocation.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedAllocationGenerator.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignment.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/DerivedDayAssignmentsContainer.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/EffortDistributor.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignment.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericDayAssignmentsContainer.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java
View file

@ -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;

6
libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java
View file

@ -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<T extends DayAssignment> 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) {

4
libreplan-business/src/main/java/org/libreplan/business/planner/entities/Share.java
View file

@ -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 {

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/ShareDivision.java
View file

@ -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 {

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SigmoidFunction.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignment.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificDayAssignmentsContainer.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskPositionConstraint.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/Distributor.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/EffortModification.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/AllocationSpec.java
View file

@ -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;

8
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/DateAndHour.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/Gap.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/InsertionRequirements.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueElement.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java
View file

@ -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;
/**

2
libreplan-business/src/main/java/org/libreplan/business/qualityforms/daos/QualityFormDAO.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java
View file

@ -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;

4
libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/reports/dtos/Util.java
View file

@ -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;
/**

2
libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/resources/daos/CriterionTypeDAO.java
View file

@ -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;

2
libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourcesSearcher.java
View file

@ -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;

Some files were not shown because too many files have changed in this diff Show more