master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
1 changed files with 7 additions and 6 deletions
Showing only changes of commit 5e0b8f9b5f - Show all commits

View File

@ -114,11 +114,12 @@ public class SparkCountryPropagationJob {
private static List<Country> merge(List<Country> c1, List<CountrySbs> c2) {
HashSet<String> countries = new HashSet<>();
if (Optional.ofNullable(c1).isPresent()) {
countries = c1.stream().map(Qualifier::getClassid)
countries = c1
.stream()
.map(Qualifier::getClassid)
.collect(Collectors.toCollection(HashSet::new));
}
HashSet<String> finalCountries = countries;
return c2
.stream()