Feat/improve schema resolving dom xml message validator

validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/schema/XmlSchemaValidation.java

@@ -42,7 +42,7 @@ public class XmlSchemaValidation implements SchemaValidator<XmlMessageValidation
     private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
 
     /**
-     * Validate message with a XML schema.
+     * Validate message with an XML schema.
      *
      * @param message
      * @param context
@@ -153,4 +153,4 @@ protected void validateDTD(Resource dtdResource, Message receivedMessage) {
     public boolean supportsMessageType(String messageType, Message message) {
         return "XML".equals(messageType) || (message != null && IsXmlPredicate.getInstance().test(message.getPayload(String.class)));
     }
-}
+}

validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java

@@ -41,6 +41,7 @@
 import org.citrusframework.validation.script.ScriptValidationContext;
 import org.citrusframework.validation.xml.schema.XmlSchemaValidation;
 import org.citrusframework.xml.XsdSchemaRepository;
+import org.citrusframework.xml.schema.XsdSchemaCollection;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.xml.xsd.SimpleXsdSchema;
@@ -414,6 +415,50 @@ public void validateNoSchemaRepositoryAtAll() throws SAXException, IOException,
         validator.validateXMLSchema(message, context, new XmlMessageValidationContext());
     }
 
+    @Test
+    public void validateSchemaWithSchemaImport() throws SAXException, IOException, ParserConfigurationException {
+        Message message = new DefaultMessage("<sampleRequest  xmlns:ns='http://citrusframework.org/SampleService/Message'>"
+                + "<command>Cm123456789</command>"
+                + "<message>FOO</message>"
+                + "</sampleRequest>");
+
+        XsdSchemaRepository schemaRepository = new XsdSchemaRepository();
+        schemaRepository.setName("schemaRepository");
+
+        XsdSchemaCollection schemaCollection = new XsdSchemaCollection();
+        schemaCollection.setSchemas(List.of("org/citrusframework/validation/SampleMessage.xsd", "org/citrusframework/validation/SampleTypes.xsd"));
+        schemaCollection.initialize();
+        schemaCollection.afterPropertiesSet();
+
+        schemaRepository.getSchemas().add(schemaCollection);
+
+        context.getReferenceResolver().bind("schemaRepository", schemaRepository);
+
+        validator.validateXMLSchema(message, context, new XmlMessageValidationContext());
+    }
+
+    @Test
+    public void validateSchemaWithSchemaImportAndWildcard() throws ParserConfigurationException, IOException, SAXException {
+        Message message = new DefaultMessage("<sampleRequest  xmlns:ns='http://citrusframework.org/SampleService/Message'>"
+                + "<command>Cm123456789</command>"
+                + "<message>FOO</message>"
+                + "</sampleRequest>");
+
+        XsdSchemaRepository schemaRepository = new XsdSchemaRepository();
+        schemaRepository.setName("schemaRepository");
+
+        XsdSchemaCollection schemaCollection = new XsdSchemaCollection();
+        schemaCollection.setSchemas(List.of("org/citrusframework/validation/Sample*.xsd"));
+        schemaCollection.initialize();
+        schemaCollection.afterPropertiesSet();
+
+        schemaRepository.getSchemas().add(schemaCollection);
+
+        context.getReferenceResolver().bind("schemaRepository", schemaRepository);
+
+        validator.validateXMLSchema(message, context, new XmlMessageValidationContext());
+    }
+
     @Test(expectedExceptions = {ValidationException.class})
     public void validateXMLSchemaError() throws SAXException, IOException, ParserConfigurationException {
         Message message = new DefaultMessage("<message xmlns='http://citrusframework.org/test'>"