Compare commits

..

No commits in common. "eb4692e4ee42435ff9e991ad17aab0d500f79628" and "776c898c4bd281ceca5824ec2ea4fa776df36cfb" have entirely different histories.

1 changed files with 2 additions and 3 deletions

View File

@ -270,9 +270,8 @@ public class MergeUtils {
}
HashMap<String, KeyValue> values = new HashMap<>();
Optional.ofNullable(left).ifPresent(l -> l.forEach(kv -> values.put(kv.getKey(), kv)));
Optional.ofNullable(right).ifPresent(r -> r.forEach(kv -> values.putIfAbsent(kv.getKey(), kv)));
left.forEach(kv -> values.put(kv.getKey(), kv));
right.forEach(kv -> values.putIfAbsent(kv.getKey(), kv));
return new ArrayList<>(values.values());
}