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

#59 fix unparsed text uri resolving

Browse source
This commit is contained in:
Andreas Penski 2020-07-29 12:13:18 +00:00
parent 13de7f00a4
commit 0717e22d33
10 changed files with 58 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java
View file

@ -20,7 +20,6 @@
package de.kosit.validationtool.impl.xml;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URI;
@ -32,6 +31,8 @@ import javax.xml.transform.stream.StreamSource;
import lombok.RequiredArgsConstructor;
import net.sf.saxon.Configuration;
import net.sf.saxon.lib.StandardUnparsedTextResolver;
import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.trans.XPathException;
/**
@ -41,7 +42,7 @@ import net.sf.saxon.trans.XPathException;
* @author Andreas Penski
*/
@RequiredArgsConstructor()
public class RelativeUriResolver implements URIResolver {
public class RelativeUriResolver implements URIResolver, UnparsedTextURIResolver {
/** the base uri */
private final URI baseUri;
@ -93,6 +94,16 @@ public class RelativeUriResolver implements URIResolver {
return r.startsWith(base);
}
// from UnparsedTextURIResolver
@Override
public Reader resolve(final URI absoluteURI, final String encoding, final Configuration config) throws XPathException {
if (isUnderBaseUri(absoluteURI, this.baseUri)) {
return new StandardUnparsedTextResolver().resolve(absoluteURI, encoding, config);
} else {
throw new XPathException(String.format("The resolved transformation artifact %s is not within the configured repository %s",
absoluteURI, this.baseUri));
}
}
}

5
src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java
View file

@ -109,6 +109,11 @@ public class StrictRelativeResolvingStrategy extends BaseResolvingStrategy {
return new RelativeUriResolver(repositoryURI);
}
@Override
public UnparsedTextURIResolver createUnparsedTextURIResolver(final URI scenarioRepository) {
return new RelativeUriResolver(scenarioRepository);
}
@Override
public Validator createValidator(final Schema schema) {
if (schema == null) {