master #59

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

View File

@ -48,8 +48,8 @@ public class OafMapperUtils {
public static Result mergeResults(Result left, Result right) { public static Result mergeResults(Result left, Result right) {
final boolean leftFromDeletedAuthority = isFromDeletedAuthority(left); final boolean leftFromDeletedAuthority = isFromDelegatedAuthority(left);
final boolean rightFromDeletedAuthority = isFromDeletedAuthority(right); final boolean rightFromDeletedAuthority = isFromDelegatedAuthority(right);
if (leftFromDeletedAuthority && !rightFromDeletedAuthority) { if (leftFromDeletedAuthority && !rightFromDeletedAuthority) {
return left; return left;
@ -67,12 +67,16 @@ public class OafMapperUtils {
} }
} }
private static boolean isFromDeletedAuthority(Result r) { private static boolean isFromDelegatedAuthority(Result r) {
return r return Optional
.getInstance() .ofNullable(r.getInstance())
.map(
instance -> instance
.stream() .stream()
.filter(i -> Objects.nonNull(i.getCollectedfrom()))
.map(i -> i.getCollectedfrom().getKey()) .map(i -> i.getCollectedfrom().getKey())
.anyMatch(cfId -> IdentifierFactory.delegatedAuthorityDatasourceIds().contains(cfId)); .anyMatch(cfId -> IdentifierFactory.delegatedAuthorityDatasourceIds().contains(cfId)))
.orElse(false);
} }
public static KeyValue keyValue(final String k, final String v) { public static KeyValue keyValue(final String k, final String v) {