Merge branch '345-nulls' of https://github.com/hbz/lobid-gnd

Resolves #345 See: https://lobid.org/gnd/300188285, https://lobid.org/gnd/30024570X
hbz · Jun 12, 2023 · 92e0749 · 92e0749
2 parents fffdd2b + a8ef908
commit 92e0749
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/models/AuthorityResource.java b/app/models/AuthorityResource.java
@@ -193,7 +193,8 @@ private void addGroupingNodes(List<Map<String, Object>> result) {
 
 	private void addGndEntityNodes(List<Map<String, Object>> result) {
 		result.add(ImmutableMap.of("id", getId(), "label", wrapped(preferredName), "shape", "box"));
-		gndNodes().stream().flatMap(pair -> pair.getRight().stream()).distinct().forEach(node -> {
+		gndNodes().stream().flatMap(pair -> pair.getRight().stream()).distinct()
+				.filter(node -> node.get("id") != null && node.get("label") != null).forEach(node -> {
 			String id = node.get("id").asText().substring(GND_PREFIX.length());
 			String label = wrapped(node.get("label").asText());
 			String title = "Details zu " + label + " öffnen";
@@ -206,7 +207,7 @@ private void addGroupedConnections(List<Map<String, Object>> result) {
 			String rel = pair.getLeft();
 			String label = wrapped(GndOntology.label(rel));
 			result.add(ImmutableMap.of("from", getId(), "to", rel));
-			pair.getRight().forEach(node -> {
+			pair.getRight().stream().filter(node -> node.get("id") != null).forEach(node -> {
 				String to = node.get("id").asText().substring(GND_PREFIX.length());
 				String title = String.format("Einträge mit %s '%s' suchen", label, GndOntology.label(GND_PREFIX + to));
 				String id = rel + "_" + to;