diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java index 23a2a05dd..7fd86bb4b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Set; import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; /** * This class models a worker. @@ -44,6 +45,7 @@ public class Worker extends Resource { return worker; } + @NotNull @NotEmpty private String firstName; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java index b836708f3..1df120f29 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java @@ -26,6 +26,7 @@ import java.util.Set; import org.hibernate.validator.NotEmpty; import org.hibernate.validator.NotNull; +import org.hibernate.validator.Valid; import org.navalplanner.business.common.BaseEntity; /** @@ -61,6 +62,7 @@ public class WorkReport extends BaseEntity { private WorkReportType workReportType; + @Valid private Set workReportLines = new HashSet(); /** diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java index 0f2619f87..4fb038fb2 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java @@ -56,10 +56,9 @@ public class WorkReportLine extends BaseEntity { private Integer numHours; - @NotNull + private Resource resource; - @NotNull private OrderElement orderElement; private WorkReport workReport; @@ -89,6 +88,7 @@ public class WorkReportLine extends BaseEntity { this.numHours = numHours; } + @NotNull public Resource getResource() { return resource; } @@ -97,6 +97,7 @@ public class WorkReportLine extends BaseEntity { this.resource = resource; } + @NotNull public OrderElement getOrderElement() { return orderElement; } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java index a0be21248..9f7836abd 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue; import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE; -import java.util.Arrays; import java.util.Date; import java.util.List; @@ -37,8 +36,6 @@ import javax.annotation.Resource; import org.hibernate.SessionFactory; import org.junit.Before; -import org.hibernate.validator.ClassValidator; -import org.hibernate.validator.InvalidValue; import org.junit.Test; import org.junit.runner.RunWith; import org.navalplanner.business.IDataBootstrap; @@ -164,12 +161,6 @@ public class TaskElementDAOTest { @Test public void canSaveMilestone() { TaskMilestone milestone = createValidTaskMilestone(); - ClassValidator validator = new ClassValidator( - TaskMilestone.class); - InvalidValue[] invalidValues = validator.getInvalidValues(milestone); - if (invalidValues.length > 0) { - throw new RuntimeException(Arrays.toString(invalidValues)); - } taskElementDAO.save(milestone); flushAndEvict(milestone); TaskElement fromDB; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java index 4d4466026..7bb6a13fe 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java @@ -26,8 +26,6 @@ import java.math.BigDecimal; import java.util.List; import org.apache.commons.lang.Validate; -import org.hibernate.validator.ClassValidator; -import org.hibernate.validator.InvalidValue; import org.navalplanner.business.advance.daos.IAdvanceTypeDAO; import org.navalplanner.business.advance.entities.AdvanceType; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; @@ -49,9 +47,6 @@ public class AdvanceTypeModel implements IAdvanceTypeModel { private AdvanceType advanceType; - private ClassValidator advanceTypeValidator = new ClassValidator( - AdvanceType.class); - @Autowired private IAdvanceTypeDAO advanceTypeDAO; @@ -104,11 +99,6 @@ public class AdvanceTypeModel implements IAdvanceTypeModel { @Override @Transactional public void save() throws ValidationException { - InvalidValue[] invalidValues = advanceTypeValidator - .getInvalidValues(advanceType); - if (invalidValues.length > 0) { - throw new ValidationException(invalidValues); - } advanceTypeDAO.save(advanceType); checkCanBeModified(advanceType); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java index d762011fb..b4bb3ed21 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java @@ -26,7 +26,6 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang.Validate; -import org.hibernate.validator.ClassValidator; import org.hibernate.validator.InvalidValue; import org.joda.time.LocalDate; import org.navalplanner.business.calendars.daos.IBaseCalendarDAO; @@ -64,9 +63,6 @@ public class BaseCalendarModel implements IBaseCalendarModel { protected boolean editing = false; - private ClassValidator baseCalendarValidator = new ClassValidator( - BaseCalendar.class); - @Autowired private IBaseCalendarDAO baseCalendarDAO; @@ -430,12 +426,6 @@ public class BaseCalendarModel implements IBaseCalendarModel { @Override public void checkInvalidValuesCalendar(BaseCalendar entity) throws ValidationException { - InvalidValue[] invalidValues = baseCalendarValidator - .getInvalidValues(entity); - if (invalidValues.length > 0) { - throw new ValidationException(invalidValues); - } - if (baseCalendarDAO.thereIsOtherWithSameName(entity)) { InvalidValue[] invalidValues2 = { new InvalidValue(_( "{0} already exists", entity.getName()), diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java index f83a7a2b7..3ccce54d4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java @@ -23,11 +23,9 @@ package org.navalplanner.web.labels; import static org.navalplanner.web.I18nHelper._; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.commons.lang.Validate; -import org.hibernate.validator.ClassValidator; import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; @@ -53,12 +51,6 @@ public class LabelTypeModel implements ILabelTypeModel { private LabelType labelType; - private ClassValidator validatorLabelType = new ClassValidator( - LabelType.class); - - private ClassValidator