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

Last methods extracting and reordering of methods to improve readability

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-28 12:51:35 +01:00
parent 2ba362745d
commit e6fbd02e4b
1 changed files with 54 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/DayAssignmentDAO.java
View file

@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@ -62,59 +61,33 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
@Transactional(readOnly = true)
public SortedMap<LocalDate, Integer> getHoursAssignedByDayFor(
TaskElement taskElement) {
return calculateHoursAssignedByDayFor(taskElement
.getResourceAllocations());
}
private SortedMap<LocalDate, Integer> calculateHoursAssignedByDayFor(
Collection<ResourceAllocation<?>> resourceAllocations) {
SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
addResultsFromGeneric(result, resourceAllocations);
addResultsFromSpecific(result, resourceAllocations);
return result;
}
Set<ResourceAllocation<?>> resourceAllocations = taskElement
.getResourceAllocations();
private void addResultsFromGeneric(
SortedMap<LocalDate, Integer> result,
Collection<ResourceAllocation<?>> resourceAllocations) {
List<GenericResourceAllocation> genericResourceAllocations = withId(getOfType(
GenericResourceAllocation.class, resourceAllocations));
addToResult(result, queryHoursByDay(GenericDayAssignment.class,
"genericResourceAllocation", genericResourceAllocations));
}
private void addResultsFromSpecific(SortedMap<LocalDate, Integer> result,
Collection<ResourceAllocation<?>> resourceAllocations) {
List<SpecificResourceAllocation> specificResourceAllocations = withId(getOfType(
SpecificResourceAllocation.class, resourceAllocations));
addHoursByDate(result, queryHoursByDay(GenericDayAssignment.class,
"genericResourceAllocation", genericResourceAllocations));
addHoursByDate(result, queryHoursByDay(SpecificDayAssignment.class,
addToResult(result, queryHoursByDay(SpecificDayAssignment.class,
"specificResourceAllocation", specificResourceAllocations));
return result;
}
@SuppressWarnings("unchecked")
private <T extends DayAssignment, R extends ResourceAllocation<T>> List<Object[]> queryHoursByDay(
Class<T> classBeingSearched, String allocationRelationship,
List<R> allocations) {
if (allocations.isEmpty()) {
return Collections.emptyList();
}
Criteria criteria = getSession().createCriteria(classBeingSearched);
criteria.add(Restrictions.in(allocationRelationship, allocations));
criteria.setProjection(Projections.projectionList().add(
Property.forName("day").group()).add(Projections.sum("hours")));
List<Object[]> list = criteria.list();
return list;
}
private void addHoursByDate(SortedMap<LocalDate, Integer> result,
List<Object[]> list) {
for (Object[] object : list) {
LocalDate date = (LocalDate) object[0];
Integer hours = (Integer) object[1];
int current = result.get(date) != null ? result.get(date) : 0;
result.put(date, current + hours);
}
}
private <T extends BaseEntity> List<T> withId(List<T> elements) {
List<T> result = new ArrayList<T>();
for (T element : elements) {
if (element.getId() != null) {
result.add(element);
}
}
return result;
}
private <T extends ResourceAllocation<?>> List<T> getOfType(Class<T> type,
@ -128,4 +101,39 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
return result;
}
private <T extends BaseEntity> List<T> withId(List<T> elements) {
List<T> result = new ArrayList<T>();
for (T element : elements) {
if (element.getId() != null) {
result.add(element);
}
}
return result;
}
@SuppressWarnings("unchecked")
private <T extends DayAssignment, R extends ResourceAllocation<T>> List<Object[]> queryHoursByDay(
Class<T> classBeingSearched, String allocationRelationship,
List<R> allocations) {
if (allocations.isEmpty()) {
return Collections.emptyList();
}
Criteria criteria = getSession().createCriteria(classBeingSearched);
criteria.add(Restrictions.in(allocationRelationship, allocations));
criteria.setProjection(Projections.projectionList().add(
Property.forName("day").group()).add(Projections.sum("hours")));
List<Object[]> list = criteria.list();
return list;
}
private void addToResult(SortedMap<LocalDate, Integer> result,
List<Object[]> list) {
for (Object[] object : list) {
LocalDate date = (LocalDate) object[0];
Integer hours = (Integer) object[1];
int current = result.get(date) != null ? result.get(date) : 0;
result.put(date, current + hours);
}
}
}