mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Bug 5085: Conversion to classic for loop to prevent problems with null
values in Collectors.toMap
This commit is contained in:
1 parent
5194e15212
commit
0857fd3cdb
2 files changed
+11
-4
No files matched your search
+6
-2
@@ -1,9 +1,9 @@
|
||||
package com.sap.sailing.domain.coursetemplate.impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.sap.sailing.domain.coursetemplate.CourseConfigurationBase;
|
||||
import com.sap.sailing.domain.coursetemplate.CourseTemplate;
|
||||
@@ -66,7 +66,11 @@ public abstract class CourseConfigurationBaseImpl<R extends IsMarkRole> implemen
|
||||
|
||||
@Override
|
||||
public Map<MarkConfiguration, R> getAllMarksWithOptionalRoles() {
|
||||
return markConfigurations.stream().collect(Collectors.toMap(mc -> mc, associatedRoles::get));
|
||||
final Map<MarkConfiguration, R> result = new HashMap<>();
|
||||
for (MarkConfiguration mc : markConfigurations) {
|
||||
result.put(mc, associatedRoles.get(mc));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+5
-2
@@ -7,7 +7,6 @@ import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.sap.sailing.domain.coursetemplate.CourseTemplate;
|
||||
import com.sap.sailing.domain.coursetemplate.MarkRole;
|
||||
@@ -129,7 +128,11 @@ public class CourseTemplateImpl extends NamedWithUUIDImpl implements CourseTempl
|
||||
|
||||
@Override
|
||||
public Map<MarkTemplate, MarkRole> getMarkTemplatesWithOptionalRoles() {
|
||||
return marks.stream().collect(Collectors.toMap(mc -> mc, associatedRoles::get));
|
||||
final Map<MarkTemplate, MarkRole> result = new HashMap<>();
|
||||
for (MarkTemplate mt : marks) {
|
||||
result.put(mt, associatedRoles.get(mt));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user