fix: fix exporting HSD schemas for schemas with no namespace

ING-4046
halestudio · Oct 26, 2023 · afafbe1 · afafbe1
1 parent e27cc17
commit afafbe1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...ommon.schema.persist/src/eu/esdihumboldt/hale/common/schema/persist/hsd/MergeSchemas.java b/...ommon.schema.persist/src/eu/esdihumboldt/hale/common/schema/persist/hsd/MergeSchemas.java
@@ -73,8 +73,15 @@ public String getNamespace() {
 	public static Iterable<? extends Schema> merge(Iterable<? extends Schema> schemas,
 			boolean mergeAll) {
 		// count namespaces
-		Map<String, Long> counts = Streams.stream(schemas).map(schema -> schema.getNamespace())
-				.collect(Collectors.groupingBy(e -> e, Collectors.counting()));
+		Map<String, Long> counts = Streams.stream(schemas).map(schema -> {
+			String ns = schema.getNamespace();
+			if (ns == null) {
+				// replace null with empty string -> counting fails for null
+				// values
+				ns = "";
+			}
+			return ns;
+		}).collect(Collectors.groupingBy(e -> e, Collectors.counting()));
 
 		if (mergeAll) {
 			// we merge to one namespace
@@ -86,6 +93,9 @@ public static Iterable<? extends Schema> merge(Iterable<? extends Schema> schema
 			else {
 				namespace = DEFAULT_COMBINED_NAMESPACE;
 			}
+			if ("".equals(namespace)) {
+				namespace = null;
+			}
 
 			Schema schema = new MergedSchema(namespace, schemas);