diff --git a/src/main/java/de/kosit/validationtool/impl/ContentRepository.java b/src/main/java/de/kosit/validationtool/impl/ContentRepository.java index 84cd418..b178892 100644 --- a/src/main/java/de/kosit/validationtool/impl/ContentRepository.java +++ b/src/main/java/de/kosit/validationtool/impl/ContentRepository.java @@ -47,6 +47,7 @@ import lombok.extern.slf4j.Slf4j; import de.kosit.validationtool.api.ResolvingConfigurationStrategy; import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.xml.RelativeUriResolver; +import de.kosit.validationtool.impl.xml.StringTrimAdapter; import de.kosit.validationtool.model.scenarios.NamespaceType; import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ScenarioType; @@ -284,13 +285,13 @@ public class ContentRepository { public XPathExecutable createMatchExecutable(final ScenarioType s) { final Map namespaces = s.getNamespace().stream() - .collect(Collectors.toMap(NamespaceType::getPrefix, NamespaceType::getValue)); + .collect(Collectors.toMap(NamespaceType::getPrefix, ns -> StringTrimAdapter.trim(ns.getValue()))); return createXPath(s.getMatch(), namespaces); } public XPathExecutable createAccepptExecutable(final ScenarioType s) { final Map namespaces = s.getNamespace().stream() - .collect(Collectors.toMap(NamespaceType::getPrefix, NamespaceType::getValue)); + .collect(Collectors.toMap(NamespaceType::getPrefix, ns -> StringTrimAdapter.trim(ns.getValue()))); return createXPath(s.getAcceptMatch(), namespaces); } diff --git a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java new file mode 100644 index 0000000..c6c59b3 --- /dev/null +++ b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java @@ -0,0 +1,29 @@ +package de.kosit.validationtool.impl.xml; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +public class StringTrimAdapter extends XmlAdapter { + + @Override + public String unmarshal(final String v) { + if (v == null) { + return null; + } + return v.trim(); + } + + @Override + public String marshal(final String v) { + if (v == null) { + return null; + } + return v.trim(); + } + + public static String trim(final String v) { + if (v == null) { + return null; + } + return v.trim(); + } +} \ No newline at end of file diff --git a/src/main/model/binding/global.xjb b/src/main/model/binding/global.xjb index be1e39c..a101944 100644 --- a/src/main/model/binding/global.xjb +++ b/src/main/model/binding/global.xjb @@ -26,7 +26,12 @@ jaxb:extensionBindingPrefixes="inheritance" version="2.1"> - + + + diff --git a/src/test/resources/examples/simple/scenarios.xml b/src/test/resources/examples/simple/scenarios.xml index 1513b5d..1e56b26 100644 --- a/src/test/resources/examples/simple/scenarios.xml +++ b/src/test/resources/examples/simple/scenarios.xml @@ -31,8 +31,10 @@

Nur Schemaprüfung.

- http://www.xoev.de/de/validator/framework/1/createreportinput - http://validator.kosit.de/test-sample + http://www.xoev.de/de/validator/framework/1/createreportinput + + + http://validator.kosit.de/test-sample http://validator.kosit.de/test-report /test:simple