fixed newly introduced code smells
This commit is contained in:
parent
e211a15d3e
commit
ea03826263
|
@ -2,6 +2,7 @@ TASKANA - The open source task management library
|
|||
=================================================
|
||||
|
||||
[](https://travis-ci.org/Taskana/taskana)
|
||||
[](https://sonarcloud.io/dashboard?id=Taskana_taskana)
|
||||
[](https://maven-badges.herokuapp.com/maven-central/pro.taskana/taskana-core)
|
||||
[](http://www.apache.org/licenses/LICENSE-2.0.html)
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ public class TaskanaHistoryEngineImpl implements TaskanaHistoryEngine {
|
|||
}
|
||||
|
||||
public static TaskanaHistoryEngineImpl createTaskanaEngine(
|
||||
TaskanaEngineConfiguration taskanaEngineConfiguration) throws SQLException {
|
||||
TaskanaEngineConfiguration taskanaEngineConfiguration) {
|
||||
return new TaskanaHistoryEngineImpl(taskanaEngineConfiguration);
|
||||
}
|
||||
|
||||
|
|
|
@ -34,19 +34,15 @@ public class TimeIntervalColumnHeader implements ColumnHeader<AgeQueryItem> {
|
|||
public static int getSmallestUpperLimit(List<? extends TimeIntervalColumnHeader> columnHeaders) {
|
||||
return columnHeaders.stream()
|
||||
.mapToInt(TimeIntervalColumnHeader::getUpperAgeLimit)
|
||||
.filter(i -> i < 0)
|
||||
.min()
|
||||
.orElse(0);
|
||||
}
|
||||
|
||||
public static int getLargestLowerLimit(List<? extends TimeIntervalColumnHeader> columnHeaders) {
|
||||
int greatestLowerLimit = 0;
|
||||
for (TimeIntervalColumnHeader columnHeader : columnHeaders) {
|
||||
if (columnHeader.getUpperAgeLimit() > greatestLowerLimit) {
|
||||
greatestLowerLimit = columnHeader.getLowerAgeLimit();
|
||||
}
|
||||
}
|
||||
return greatestLowerLimit;
|
||||
return columnHeaders.stream()
|
||||
.mapToInt(TimeIntervalColumnHeader::getLowerAgeLimit)
|
||||
.max()
|
||||
.orElse(0);
|
||||
}
|
||||
|
||||
public int getLowerAgeLimit() {
|
||||
|
|
|
@ -27,8 +27,8 @@ public class WorkingDaysToDaysReportConverter {
|
|||
|
||||
private static final Logger LOGGER =
|
||||
LoggerFactory.getLogger(WorkingDaysToDaysReportConverter.class);
|
||||
private WorkingDaysToDaysConverter daysToWorkingDaysConverter;
|
||||
private Map<Integer, Integer> cacheDaysToWorkingDays;
|
||||
private final WorkingDaysToDaysConverter daysToWorkingDaysConverter;
|
||||
private final Map<Integer, Integer> cacheDaysToWorkingDays;
|
||||
|
||||
WorkingDaysToDaysReportConverter(
|
||||
List<? extends TimeIntervalColumnHeader> columnHeaders,
|
||||
|
@ -93,30 +93,30 @@ public class WorkingDaysToDaysReportConverter {
|
|||
|
||||
protected Map<Integer, Integer> generateDaysToWorkingDays(
|
||||
List<? extends TimeIntervalColumnHeader> columnHeaders, final Instant referenceDate) {
|
||||
HashMap<Integer, Integer> cacheDaysToWorkingDays = new HashMap<>();
|
||||
cacheDaysToWorkingDays.put(0, 0);
|
||||
HashMap<Integer, Integer> daysToWorkingDaysMap = new HashMap<>();
|
||||
daysToWorkingDaysMap.put(0, 0);
|
||||
|
||||
int positiveWorkdayLimit = TimeIntervalColumnHeader.getLargestLowerLimit(columnHeaders);
|
||||
calculateFutureDaysToWorkingDays(cacheDaysToWorkingDays, referenceDate, positiveWorkdayLimit);
|
||||
calculateFutureDaysToWorkingDays(daysToWorkingDaysMap, referenceDate, positiveWorkdayLimit);
|
||||
|
||||
int negativeWorkdayLimit = TimeIntervalColumnHeader.getSmallestUpperLimit(columnHeaders);
|
||||
calculateNegativeDaysToWorkingDays(cacheDaysToWorkingDays, referenceDate, negativeWorkdayLimit);
|
||||
calculateNegativeDaysToWorkingDays(daysToWorkingDaysMap, referenceDate, negativeWorkdayLimit);
|
||||
|
||||
return cacheDaysToWorkingDays;
|
||||
return daysToWorkingDaysMap;
|
||||
}
|
||||
|
||||
private void calculateFutureDaysToWorkingDays(
|
||||
HashMap<Integer, Integer> cacheDaysToWorkingDays, Instant referenceDate, int workdayLimit) {
|
||||
calculateDaysToWorkingDays(cacheDaysToWorkingDays, referenceDate, workdayLimit, 1);
|
||||
HashMap<Integer, Integer> daysToWorkingDaysMap, Instant referenceDate, int workdayLimit) {
|
||||
calculateDaysToWorkingDays(daysToWorkingDaysMap, referenceDate, workdayLimit, 1);
|
||||
}
|
||||
|
||||
private void calculateNegativeDaysToWorkingDays(
|
||||
HashMap<Integer, Integer> cacheDaysToWorkingDays, Instant referenceDate, int workdayLimit) {
|
||||
calculateDaysToWorkingDays(cacheDaysToWorkingDays, referenceDate, workdayLimit, -1);
|
||||
HashMap<Integer, Integer> daysToWorkingDaysMap, Instant referenceDate, int workdayLimit) {
|
||||
calculateDaysToWorkingDays(daysToWorkingDaysMap, referenceDate, workdayLimit, -1);
|
||||
}
|
||||
|
||||
private void calculateDaysToWorkingDays(
|
||||
HashMap<Integer, Integer> cacheDaysToWorkingDays,
|
||||
HashMap<Integer, Integer> daysToWorkingDaysMap,
|
||||
Instant referenceDate,
|
||||
int workdayLimit,
|
||||
int direction) {
|
||||
|
@ -126,7 +126,7 @@ public class WorkingDaysToDaysReportConverter {
|
|||
amountOfDays += direction;
|
||||
amountOfWorkdays +=
|
||||
(daysToWorkingDaysConverter.isWorkingDay(amountOfDays, referenceDate)) ? direction : 0;
|
||||
cacheDaysToWorkingDays.put(amountOfDays, amountOfWorkdays);
|
||||
daysToWorkingDaysMap.put(amountOfDays, amountOfWorkdays);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ class QueryClassificationAccTest extends AbstractAccTest {
|
|||
|
||||
columnValueList =
|
||||
classificationService.createClassificationQuery().domainIn("").listValues(CREATED, null);
|
||||
assertThat(columnValueList);
|
||||
assertThat(columnValueList).hasSize(1);
|
||||
|
||||
columnValueList =
|
||||
classificationService
|
||||
|
|
Loading…
Reference in New Issue