NPE prevention
This commit is contained in:
parent
f86e19b282
commit
699736addc
|
@ -137,13 +137,22 @@ public class ConversionUtils {
|
||||||
|
|
||||||
protected static List<OaBrokerTypedValue> allResultPids(final Result result) {
|
protected static List<OaBrokerTypedValue> allResultPids(final Result result) {
|
||||||
final Map<String, StructuredProperty> map = new HashMap<>();
|
final Map<String, StructuredProperty> map = new HashMap<>();
|
||||||
result.getPid().forEach(sp -> map.put(sp.getValue(), sp));
|
|
||||||
result.getInstance().forEach(i -> {
|
if (result.getPid() != null) {
|
||||||
i.getPid().forEach(sp -> map.put(sp.getValue(), sp));
|
result.getPid().forEach(sp -> map.put(sp.getValue(), sp));
|
||||||
i.getAlternateIdentifier().forEach(sp -> map.put(sp.getValue(), sp));
|
}
|
||||||
});
|
|
||||||
final List<OaBrokerTypedValue> pids = mappedList(map.values(), ConversionUtils::oafPidToBrokerPid);
|
if (result.getInstance() != null) {
|
||||||
return pids;
|
result.getInstance().forEach(i -> {
|
||||||
|
if (i.getPid() != null) {
|
||||||
|
i.getPid().forEach(sp -> map.put(sp.getValue(), sp));
|
||||||
|
}
|
||||||
|
if (i.getAlternateIdentifier() != null) {
|
||||||
|
i.getAlternateIdentifier().forEach(sp -> map.put(sp.getValue(), sp));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return mappedList(map.values(), ConversionUtils::oafPidToBrokerPid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String cleanOpenaireId(final String id) {
|
public static String cleanOpenaireId(final String id) {
|
||||||
|
|
Loading…
Reference in New Issue