demo/validator
1
0
Fork 0
mirror of https://github.com/itplr-kosit/validator.git synced 2026-05-26 01:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

some more tests

Browse source
This commit is contained in:
Andreas Penski (init) 2020-04-30 15:41:39 +02:00
parent 16dc45ab46
commit 0bb0f6671d
5 changed files with 131 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java
View file

@ -186,7 +186,16 @@ public class ConfigurationBuilder {
* @return the scenario configuration builder
*/
public static ScenarioBuilder scenario(final String name) {
return new ScenarioBuilder(name);
return new ScenarioBuilder().name(name);
}
/**
* Create a new scenario configuration.
*
* @return the scenario configuration builder
*/
public static ScenarioBuilder scenario() {
return scenario(null);
}
/**

8
src/main/java/de/kosit/validationtool/config/ScenarioBuilder.java
View file

@ -39,6 +39,7 @@ import net.sf.saxon.s9api.XPathExecutable;
*/
@RequiredArgsConstructor
@Slf4j
@Getter(AccessLevel.PACKAGE)
public class ScenarioBuilder implements Builder<Scenario> {
private static int nameCount = 0;
@ -51,8 +52,7 @@ public class ScenarioBuilder implements Builder<Scenario> {
private final XPathBuilder acceptConfig = new XPathBuilder("accept");
@Getter(AccessLevel.PACKAGE)
private final String name;
private String name;
private SchemaBuilder schemaBuilder;
@ -273,4 +273,8 @@ public class ScenarioBuilder implements Builder<Scenario> {
return type;
}
public ScenarioBuilder name(final String name) {
this.name = name;
return this;
}
}

23
src/main/java/de/kosit/validationtool/config/XPathBuilder.java
View file

@ -9,6 +9,7 @@ import java.util.Map;
import java.util.stream.StreamSupport;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import lombok.AccessLevel;
import lombok.Data;
@ -32,7 +33,7 @@ import net.sf.saxon.s9api.XPathExecutable;
@Slf4j
class XPathBuilder implements Builder<XPathExecutable> {
private static final String[] IGNORED_PREFIXES = new String[] { "xsd" };
private static final String[] IGNORED_PREFIXES = new String[] { "xsd", "saxon", "xsl", "xs" };
private final String name;
@ -66,10 +67,9 @@ class XPathBuilder implements Builder<XPathExecutable> {
try {
if (this.executable == null) {
this.executable = repository.createXPath(this.xpath, this.namespaces);
} else {
this.xpath = extractExpression();
this.namespaces = extractNamespaces();
extractNamespaces();
}
} catch (final IllegalStateException e) {
final String msg = String.format("Error creating %s xpath", this.name, e);
@ -80,16 +80,21 @@ class XPathBuilder implements Builder<XPathExecutable> {
return new Result<>(this.executable);
}
private Map<String, String> extractNamespaces() {
private void extractNamespaces() {
if (this.namespaces == null) {
this.namespaces = new HashMap<>();
}
final Map<String, String> ns = new HashMap<>();
final Iterator<String> iterator = this.executable.getUnderlyingExpression().getInternalExpression().getRetainedStaticContext()
.iteratePrefixes();
final Iterable<String> iterable = () -> iterator;
StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e)).forEach(e -> {
ns.put(e,
this.executable.getUnderlyingExpression().getInternalExpression().getRetainedStaticContext().getURIForPrefix(e, false));
});
return ns;
StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e))
.filter(StringUtils::isNotBlank).forEach(e -> {
ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression().getRetainedStaticContext()
.getURIForPrefix(e, false));
});
this.namespaces.putAll(ns);
}
private String extractExpression() {