diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java index 655b14069..5ce272920 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -35,10 +35,10 @@ import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.util.ComponentsFinder; import org.zkoss.ganttz.util.Interval; import org.zkoss.ganttz.util.LongOperationFeedback; +import org.zkoss.ganttz.util.LongOperationFeedback.ILongOperation; import org.zkoss.ganttz.util.MutableTreeModel; import org.zkoss.ganttz.util.OnZKDesktopRegistry; import org.zkoss.ganttz.util.WeakReferencedListeners; -import org.zkoss.ganttz.util.LongOperationFeedback.ILongOperation; import org.zkoss.ganttz.util.WeakReferencedListeners.IListenerNotification; import org.zkoss.ganttz.util.script.IScriptsRegister; import org.zkoss.zk.au.out.AuInvoke; @@ -444,7 +444,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { Comboitem item = new Comboitem(); item.setLabel(firstName.substring(0, 1) + " - " + lastName.substring(0, 1)); item.setDescription(firstName + " - " + lastName); - item.setValue(new Integer(position)); + item.setValue(position); filterByNameCombo.appendChild(item); position = newPosition; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java index 05a8fb030..d54f94d58 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java @@ -150,8 +150,8 @@ public class OrderElementDAO extends IntegrationEntityDAO @Override @Transactional(readOnly = true) public BigDecimal getHoursAdvancePercentage(OrderElement orderElement) { - final Integer totalChargedHours = orderElement.getSumChargedHours() != null ? orderElement - .getSumChargedHours().getTotalChargedHours() : new Integer(0); + final int totalChargedHours = orderElement.getSumChargedHours() != null ? orderElement + .getSumChargedHours().getTotalChargedHours() : 0; BigDecimal assignedHours = new BigDecimal(totalChargedHours).setScale(2); BigDecimal estimatedHours = new BigDecimal(orderElement.getWorkHours()) .setScale(2); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java index b77e7a7a4..ebf3814a6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java @@ -40,7 +40,7 @@ public abstract class HoursGroupHandler implements IHoursGroupHandler { return false; } - Integer newTotal = 0; + int newTotal = 0; for (HoursGroup hoursGroup : hoursGroups) { if (hoursGroup.isFixedPercentage()) { @@ -50,7 +50,7 @@ public abstract class HoursGroupHandler implements IHoursGroupHandler { } } - if (newTotal.compareTo(total) > 0) { + if (newTotal > total) { return false; } @@ -252,7 +252,7 @@ public abstract class HoursGroupHandler implements IHoursGroupHandler { public void setWorkHours(T orderLine, Integer workHours) throws IllegalArgumentException { if (workHours == null) { - workHours = new Integer(0); + workHours = 0; } if (workHours < 0) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedHours.java index 0b8c4ede3..eecf1aa32 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedHours.java @@ -30,9 +30,9 @@ import org.navalplanner.business.common.BaseEntity; */ public class SumChargedHours extends BaseEntity { - private Integer directChargedHours = new Integer(0); + private Integer directChargedHours = 0; - private Integer indirectChargedHours = new Integer(0); + private Integer indirectChargedHours = 0; protected SumChargedHours() {} diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/PlanningData.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/PlanningData.java index a45d10f0d..020110f95 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/PlanningData.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/PlanningData.java @@ -77,13 +77,13 @@ public class PlanningData extends BaseEntity { } private BigDecimal calculateByDuration(List criticalPath) { - Integer totalDuration = new Integer(0), duration; - BigDecimal totalProgress = BigDecimal.ZERO, progress; + int totalDuration = 0; + BigDecimal totalProgress = BigDecimal.ZERO; for (Task each : criticalPath) { - duration = each.getWorkableDays(); - progress = each.getAdvancePercentage(); - progress = progress.multiply(BigDecimal.valueOf(duration)); + int duration = each.getWorkableDays(); + BigDecimal progress = each.getAdvancePercentage().multiply( + BigDecimal.valueOf(duration)); totalDuration = totalDuration + duration; totalProgress = totalProgress.add(progress); @@ -98,8 +98,8 @@ public class PlanningData extends BaseEntity { * @param denominator * @return */ - private BigDecimal divide(BigDecimal numerator, Integer denominator) { - if (Integer.valueOf(0).equals(denominator)) { + private BigDecimal divide(BigDecimal numerator, int denominator) { + if (denominator == 0) { return BigDecimal.ZERO; } return numerator.divide(BigDecimal.valueOf(denominator), 8, diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index 28adeab61..bedb8000d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -633,7 +633,7 @@ public abstract class TaskElement extends BaseEntity { each.getType()); } - private Integer sumOfHoursAllocated = new Integer(0); + private Integer sumOfHoursAllocated = 0; public void setSumOfHoursAllocated(Integer sumOfHoursAllocated) { this.sumOfHoursAllocated = sumOfHoursAllocated; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java index b9b78e768..c91f55754 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java @@ -84,7 +84,7 @@ public class QualityFormItem implements INewObject { } public String getStringPosition() { - return position == null ? "" : new Integer(position + 1).toString(); + return position == null ? "" : Integer.valueOf(position + 1).toString(); } public void setPosition(Integer newPosition) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java index b0a1b272f..d98951d1a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java @@ -90,7 +90,7 @@ public class TaskQualityFormItem implements INewObject { } public String getStringPosition() { - return position == null ? "" : new Integer(position + 1).toString(); + return position == null ? "" : Integer.valueOf(position + 1).toString(); } private void setPosition(Integer position) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/SchedulingProgressPerOrderDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/SchedulingProgressPerOrderDTO.java index 63201626b..39091edcf 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/SchedulingProgressPerOrderDTO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/SchedulingProgressPerOrderDTO.java @@ -21,6 +21,8 @@ package org.navalplanner.business.reports.dtos; +import static org.navalplanner.business.reports.dtos.WorkingArrangementsPerOrderDTO.removeAfterDate; + import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; @@ -142,7 +144,7 @@ public class SchedulingProgressPerOrderDTO { } private Integer getHoursSpecifiedAtOrder(List tasks) { - Integer result = new Integer(0); + int result = 0; for (Task each: tasks) { result += each.getHoursSpecifiedAtOrder(); @@ -151,7 +153,7 @@ public class SchedulingProgressPerOrderDTO { } public Integer calculatePlannedHours(List tasks, LocalDate date) { - Integer result = new Integer(0); + int result = 0; for (Task each: tasks) { result += calculatePlannedHours(each, date); @@ -160,31 +162,17 @@ public class SchedulingProgressPerOrderDTO { } public Integer calculatePlannedHours(Task task, LocalDate date) { - Integer result = new Integer(0); - final List dayAssignments = task.getDayAssignments(); - if (dayAssignments.isEmpty()) { - return result; - } - - for (DayAssignment dayAssignment : dayAssignments) { - if (date == null || dayAssignment.getDay().compareTo(date) <= 0) { - result += dayAssignment.getHours(); - } - } - return result; + return DayAssignment.sum(removeAfterDate(dayAssignments, date)) + .roundToHours(); } public Integer calculateRealHours(Order order, LocalDate date) { - Integer result = new Integer(0); + int result = 0; final List workReportLines = workReportLineDAO .findByOrderElementAndChildren(order); - if (workReportLines.isEmpty()) { - return result; - } - for (WorkReportLine workReportLine : workReportLines) { final LocalDate workReportLineDate = new LocalDate(workReportLine.getDate()); if (date == null || workReportLineDate.compareTo(date) <= 0) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementsPerOrderDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementsPerOrderDTO.java index 21ede37c9..832397226 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementsPerOrderDTO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementsPerOrderDTO.java @@ -24,6 +24,7 @@ package org.navalplanner.business.reports.dtos; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.joda.time.LocalDate; @@ -45,6 +46,29 @@ import org.navalplanner.business.workreports.entities.WorkReportLine; */ public class WorkingArrangementsPerOrderDTO { + /** + * It returns a new list with the provided assignments such their dates are + * inferior to endInclusive or endInclusive is null. + * + * @param assignments + * @param endInclusive + * @return a new list with the assignments satisfying the condition + */ + public static List removeAfterDate( + Collection assignments, + LocalDate endInclusive) { + if (endInclusive == null) { + return new ArrayList(assignments); + } + List result = new ArrayList(); + for (DayAssignment each : assignments) { + if (each.getDay().compareTo(endInclusive) <= 0) { + result.add(each); + } + } + return result; + } + private IWorkReportLineDAO workReportLineDAO; private String orderName; @@ -140,7 +164,7 @@ public class WorkingArrangementsPerOrderDTO { } private Integer getHoursSpecifiedAtOrder(List tasks) { - Integer result = new Integer(0); + int result = 0; for (Task each: tasks) { result += each.getHoursSpecifiedAtOrder(); @@ -149,7 +173,7 @@ public class WorkingArrangementsPerOrderDTO { } public Integer calculatePlannedHours(List tasks, LocalDate date) { - Integer result = new Integer(0); + int result = 0; for (Task each: tasks) { result += calculatePlannedHours(each, date); @@ -157,24 +181,14 @@ public class WorkingArrangementsPerOrderDTO { return result; } - public Integer calculatePlannedHours(Task task, LocalDate date) { - Integer result = new Integer(0); - + public Integer calculatePlannedHours(Task task, final LocalDate date) { final List dayAssignments = task.getDayAssignments(); - if (dayAssignments.isEmpty()) { - return result; - } - - for (DayAssignment dayAssignment : dayAssignments) { - if (date == null || dayAssignment.getDay().compareTo(date) <= 0) { - result += dayAssignment.getHours(); - } - } - return result; + return DayAssignment.sum(removeAfterDate(dayAssignments, date)) + .roundToHours(); } public Integer calculateRealHours(List tasks, LocalDate date) { - Integer result = new Integer(0); + int result = 0; for (Task each: tasks) { result += calculateRealHours(each, date); @@ -183,13 +197,10 @@ public class WorkingArrangementsPerOrderDTO { } public Integer calculateRealHours(Task task, LocalDate date) { - Integer result = new Integer(0); + int result = 0; final List workReportLines = workReportLineDAO .findByOrderElementAndChildren(task.getOrderElement()); - if (workReportLines.isEmpty()) { - return result; - } for (WorkReportLine workReportLine : workReportLines) { final LocalDate workReportLineDate = new LocalDate(workReportLine.getDate()); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java index f99a9bd05..17bce75ec 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java @@ -526,7 +526,7 @@ public class ManualAllocationController extends GenericForwardComposer { } public void setStatus(int status) { - self.setVariable("status", new Integer(status), true); + self.setVariable("status", Integer.valueOf(status), true); } private class QueueRenderer implements ListitemRenderer { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java index 58284fbfa..2cd03a835 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java @@ -344,13 +344,15 @@ public class QueueComponent extends XulElement implements .getCapacityOn(PartialDay.wholeDay(queueElement.getEndDate())) .roundToHours(); - int shadeWidth = new Long((24 - workableHours) - * DatesMapperOnInterval.MILISECONDS_PER_HOUR - / datesMapper.getMilisecondsPerPixel()).intValue(); + int shadeWidth = Long.valueOf( + (24 - workableHours) + * DatesMapperOnInterval.MILISECONDS_PER_HOUR + / datesMapper.getMilisecondsPerPixel()).intValue(); - int shadeLeft = new Long((workableHours - queueElement.getEndHour()) - * DatesMapperOnInterval.MILISECONDS_PER_HOUR - / datesMapper.getMilisecondsPerPixel()).intValue() + int shadeLeft = Long.valueOf( + (workableHours - queueElement.getEndHour()) + * DatesMapperOnInterval.MILISECONDS_PER_HOUR + / datesMapper.getMilisecondsPerPixel()).intValue() + shadeWidth; ; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java index 9e3827819..2708323ca 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.lang.Validate; import org.apache.commons.logging.LogFactory; import org.navalplanner.business.orders.entities.HoursGroup; import org.navalplanner.business.orders.entities.OrderElement; @@ -514,14 +515,14 @@ public abstract class AssignedCriterionRequirementController extends @Override public void validate(Component comp, Object value) throws WrongValueException { - if (value == null) { - value = new Integer(0); - orderElementTotalHours.setValue((Integer) value); + Validate.isTrue(value instanceof Integer); + int intValue = value == null ? 0 : (Integer) value; + if (intValue == 0) { + orderElementTotalHours.setValue(0); } try { if (getElement() instanceof OrderLine) { - ((OrderLine) getElement()) - .setWorkHours((Integer) value); + ((OrderLine) getElement()).setWorkHours(intValue); } } catch (IllegalArgumentException e) { throw new WrongValueException(comp, _(e.getMessage())); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index 4c836795b..313a0d125 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -504,8 +504,8 @@ public class TaskElementAdapter implements ITaskElementAdapter { return BigDecimal.ZERO; } - Integer totalChargedHours = orderElement.getSumChargedHours() != null ? orderElement - .getSumChargedHours().getTotalChargedHours() : new Integer(0); + int totalChargedHours = orderElement.getSumChargedHours() != null ? orderElement + .getSumChargedHours().getTotalChargedHours() : 0; BigDecimal assignedHours = new BigDecimal(totalChargedHours).setScale(2); BigDecimal estimatedHours = new BigDecimal(taskElement.getSumOfHoursAllocated()) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index 727779f40..d28a56b4f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -883,7 +883,7 @@ public class AdvancedAllocationController extends GenericForwardComposer { Listitem item = new Listitem(); item.appendChild(new Listcell(label)); advancedAllocationVerticalPagination.appendChild(item); - verticalPaginationIndexes.add(new Integer(i)); + verticalPaginationIndexes.add(i); } if (!rowsCached.isEmpty()) { advancedAllocationVerticalPagination.setSelectedIndex(0); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java index 1de79b0bc..d3eaddaf0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java @@ -179,7 +179,7 @@ public class LimitingAllocationRow { } public String getPriorityStr() { - return (new Integer(getPriority()).toString()); + return Integer.valueOf(getPriority()).toString(); } public void setPriorityStr(String priority) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java index ffa19393e..eada75048 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java @@ -37,13 +37,10 @@ import org.navalplanner.web.planner.allocation.TaskInformation; import org.navalplanner.web.planner.allocation.TaskInformation.ITotalHoursCalculationListener; import org.navalplanner.web.planner.order.PlanningState; import org.navalplanner.web.planner.taskedition.EditTaskController; -import org.navalplanner.web.planner.taskedition.TaskPropertiesController.ResourceAllocationTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.zkoss.ganttz.extensions.IContextWithPlannerTask; -import org.zkoss.ganttz.timetracker.ICellForDetailItemRenderer; -import org.zkoss.ganttz.timetracker.OnColumnsRowRenderer; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -231,7 +228,7 @@ public class LimitingResourceAllocationController extends GenericForwardComposer Listbox result = listbox(); for (int i = 1; i <= 10; i++) { Listitem item = new Listitem(); - Listcell cell = new Listcell(new Integer(i).toString()); + Listcell cell = new Listcell(i + ""); cell.setParent(item); if (i == selectedValue) { item.setSelected(true); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java index ab1c2f2f5..778b36b31 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java @@ -31,10 +31,10 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; @@ -427,7 +427,7 @@ public class ResourceLoadController implements Composer { Comboitem item = new Comboitem(); item.setLabel(firstName.substring(0, 1) + " - " + lastName.substring(0, 1)); item.setDescription(firstName + " - " + lastName); - item.setValue(new Integer(position)); + item.setValue(position); filterByNameCombo.appendChild(item); if(resourceLoadModel.getPageFilterPosition() == position) { filterByNameCombo.setSelectedItemApi(item); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java index 8501db7fb..1d06d758f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java @@ -63,7 +63,7 @@ public abstract class GenericRESTService instanceConstraintViolationsList = new ArrayList(); - Long numItem = new Long(1); + long numItem = 1; for (DTO entityDTO : entityDTOs) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java index b65db0b8f..9c08f8848 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java @@ -172,7 +172,7 @@ public class SubcontractServiceREST implements ISubcontractService { }); } catch (ValidationException e) { InstanceConstraintViolationsDTO violation = ConstraintViolationConverter - .toDTO(new InstanceConstraintViolationsDTOId(new Long(1), + .toDTO(new InstanceConstraintViolationsDTOId(Long.valueOf(1), orderElementDTO.code, OrderDTO.ENTITY_TYPE), e); throw new ViolationError(violation); }