Fixed null in config (#872)

* Fixed null in config * Made backwards compatible
finos · Nov 20, 2024 · f45ca93 · f45ca93
1 parent 6f1b774
commit f45ca93
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/rosetta-runtime/src/main/java/com/rosetta/util/serialisation/TypeXMLConfiguration.java b/rosetta-runtime/src/main/java/com/rosetta/util/serialisation/TypeXMLConfiguration.java
@@ -32,6 +32,16 @@ public class TypeXMLConfiguration {
 	private final Optional<Map<String, String>> enumValues;
 
 	@JsonCreator
+	@Deprecated
+	public TypeXMLConfiguration(
+			@JsonProperty("substitutionFor") Optional<ModelSymbolId> substitutionFor,
+			@JsonProperty("xmlElementName") Optional<String> xmlElementName,
+			@JsonProperty("xmlRootElementName") @Deprecated Optional<String> xmlRootElementName,
+			@JsonProperty("xmlAttributes") Optional<Map<String, String>> xmlAttributes,
+			@JsonProperty("attributes") Optional<Map<String, AttributeXMLConfiguration>> attributes,
+			@JsonProperty("enumValues") Optional<Map<String, String>> enumValues) {
+		this(substitutionFor, xmlElementName.isPresent() ? xmlElementName : xmlRootElementName, xmlAttributes, attributes, enumValues);
+	}
 	public TypeXMLConfiguration(
 			@JsonProperty("substitutionFor") Optional<ModelSymbolId> substitutionFor,
 			@JsonProperty("xmlElementName") Optional<String> xmlElementName,

diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/ImportTargetConfig.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/ImportTargetConfig.java
@@ -1,5 +1,6 @@
 package com.regnosys.rosetta.tools.modelimport;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 
@@ -20,7 +21,7 @@ public ImportTargetConfig(
 			@JsonProperty("preferences") ImportTargetPreferences preferences) {
 		this.namespace = namespace;
 		this.namespaceDefinition = namespaceDefinition;
-		this.nameOverrides = nameOverrides;
+		this.nameOverrides = nameOverrides == null ? Collections.emptyMap() : nameOverrides;
 		this.preferences = preferences == null ? new ImportTargetPreferences(null, null, null) : preferences;
 	}
 

diff --git a/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/modelimport/ImportConfigTest.java b/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/modelimport/ImportConfigTest.java
@@ -22,6 +22,7 @@ void shouldLoadConfigFromFile() throws FileNotFoundException, IOException {
 		// assert
 		assertEquals("test.ns", config.getTarget().getNamespace());
 		assertEquals("Test namespace definition", config.getTarget().getNamespaceDefinition());
+		assertNotNull(config.getTarget().getNameOverrides());
 		assertNotNull(config.getTarget().getPreferences());
 	}