master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
1 changed files with 14 additions and 11 deletions
Showing only changes of commit 3465c8ccee - Show all commits

View File

@ -59,12 +59,14 @@ public class CleaningFunctions {
} }
} }
if (Objects.nonNull(r.getAuthor())) { if (Objects.nonNull(r.getAuthor())) {
r.getAuthor() r
.getAuthor()
.stream() .stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.forEach(a -> { .forEach(a -> {
if (Objects.nonNull(a.getPid())) { if (Objects.nonNull(a.getPid())) {
a.getPid() a
.getPid()
.stream() .stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.forEach(p -> fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES)); .forEach(p -> fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES));
@ -208,6 +210,7 @@ public class CleaningFunctions {
a a
.getPid() .getPid()
.stream() .stream()
.filter(Objects::nonNull)
.filter(p -> Objects.nonNull(p.getQualifier())) .filter(p -> Objects.nonNull(p.getQualifier()))
.filter(p -> StringUtils.isNotBlank(p.getValue())) .filter(p -> StringUtils.isNotBlank(p.getValue()))
.map(p -> { .map(p -> {