Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ConfigurationReader.cs =================================================================== diff -u -r94587578a17566618ad7b26fc914d8b4d30fb99b -r3d1a79d25b4059b58271f549f62fc48ac1d1a3ec --- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ConfigurationReader.cs (.../ConfigurationReader.cs) (revision 94587578a17566618ad7b26fc914d8b4d30fb99b) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ConfigurationReader.cs (.../ConfigurationReader.cs) (revision 3d1a79d25b4059b58271f549f62fc48ac1d1a3ec) @@ -51,12 +51,16 @@ /// Creates a new instance of . /// /// The file path to the XML file. - /// A string representing an XML Schema Definition (XSD). + /// A string representing the main schema definition. + /// A containing + /// one or more nested schema definitions; the keys should represent unique file names by which + /// the schema definitions can be referenced from , the + /// values should represent the corresponding schema definition strings. /// Thrown when: /// /// is invalid. - /// is null or empty. - /// contains an invalid schema definition. + /// is null or empty. + /// contains an invalid schema definition. /// /// /// Thrown when: @@ -66,20 +70,20 @@ /// points to a file that does not pass the schema validation. /// /// - protected ConfigurationReader(string xmlFilePath, string schemaString) + protected ConfigurationReader(string xmlFilePath, string mainSchemaDefinition, IDictionary nestedSchemaDefinitions) { IOUtils.ValidateFilePath(xmlFilePath); - if (string.IsNullOrWhiteSpace(schemaString)) + if (string.IsNullOrWhiteSpace(mainSchemaDefinition)) { - throw new ArgumentException(nameof(schemaString)); + throw new ArgumentException(nameof(mainSchemaDefinition)); } ValidateFileExists(xmlFilePath); xmlDocument = LoadDocument(xmlFilePath); - ValidateToSchema(xmlDocument, schemaString, xmlFilePath); + ValidateToSchema(xmlDocument, mainSchemaDefinition, xmlFilePath); ValidateNotEmpty(xmlDocument, xmlFilePath); }