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

(fix) names

Browse source
This commit is contained in:
Andreas Penski (init) 2019-05-17 14:05:48 +02:00 • committed by Andreas Penski
parent 3d777fa8e5
commit 7ba7c84533
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java
View file

@ -57,7 +57,7 @@ public class CollectingErrorEventHandler implements ValidationEventHandler, Erro
private static XMLSyntaxError createError(final XMLSyntaxErrorSeverity severity, final String message) { private static XMLSyntaxError createError(final XMLSyntaxErrorSeverity severity, final String message) {
final XMLSyntaxError e = new XMLSyntaxError(); final XMLSyntaxError e = new XMLSyntaxError();
e.setSeverity(severity); e.setSeverityCode(severity);
e.setMessage(message); e.setMessage(message);
return e; return e;
} }
@ -141,7 +141,7 @@ public class CollectingErrorEventHandler implements ValidationEventHandler, Erro
e.setRowNumber(locator.getLineNumber()); e.setRowNumber(locator.getLineNumber());
} }
e.setMessage("Error procesing" + content.getStringValue()); e.setMessage("Error procesing" + content.getStringValue());
e.setSeverity(terminate ? XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR : XMLSyntaxErrorSeverity.SEVERITY_WARNING); e.setSeverityCode(terminate ? XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR : XMLSyntaxErrorSeverity.SEVERITY_WARNING);
} }
@Override @Override

2
src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java
View file

@ -94,7 +94,7 @@ public class ScenarioRepository {
private static void checkVersion(final URI scenarioDefinition) { private static void checkVersion(final URI scenarioDefinition) {
final DocumentParseAction p = new DocumentParseAction(); final DocumentParseAction p = new DocumentParseAction();
try { try {
final Result<XdmNode, XMLSyntaxError> result = p.parseDocument(InputFactory.read(scenarioDefinition.toURL())); final Result<XdmNode, XMLSyntaxError> result = DocumentParseAction.parseDocument(InputFactory.read(scenarioDefinition.toURL()));
if (result.isValid() && !isSupportedDocument(result.getObject())) { if (result.isValid() && !isSupportedDocument(result.getObject())) {
throw new IllegalStateException(String.format( throw new IllegalStateException(String.format(
"Specified scenario configuration %s is not supported.%nThis version only supports definitions of '%s'", "Specified scenario configuration %s is not supported.%nThis version only supports definitions of '%s'",

18
src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java
View file

@ -56,20 +56,20 @@ public class DocumentParseAction implements CheckAction {
* @param content ein Dokument * @param content ein Dokument
* @return Ergebnis des Parsings inklusive etwaiger Fehler * @return Ergebnis des Parsings inklusive etwaiger Fehler
*/ */
public Result<XdmNode, XMLSyntaxError> parseDocument(Input content) { public static Result<XdmNode, XMLSyntaxError> parseDocument(final Input content) {
if (content == null) { if (content == null) {
throw new IllegalArgumentException("Input may not be null"); throw new IllegalArgumentException("Input may not be null");
} }
Result<XdmNode, XMLSyntaxError> result; Result<XdmNode, XMLSyntaxError> result;
try ( InputStream input = new ByteArrayInputStream(content.getContent()) ) { try ( final InputStream input = new ByteArrayInputStream(content.getContent()) ) {
final DocumentBuilder builder = ObjectFactory.createProcessor().newDocumentBuilder(); final DocumentBuilder builder = ObjectFactory.createProcessor().newDocumentBuilder();
builder.setLineNumbering(true); builder.setLineNumbering(true);
XdmNode doc = builder.build(new StreamSource(input)); final XdmNode doc = builder.build(new StreamSource(input));
result = new Result<>(doc, Collections.emptyList()); result = new Result<>(doc, Collections.emptyList());
} catch (SaxonApiException | IOException e) { } catch (final SaxonApiException | IOException e) {
log.debug("Exception while parsing {}", content.getName(), e); log.debug("Exception while parsing {}", content.getName(), e);
XMLSyntaxError error = new XMLSyntaxError(); final XMLSyntaxError error = new XMLSyntaxError();
error.setSeverity(XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR); error.setSeverityCode(XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR);
error.setMessage(String.format("IOException while reading resource %s: %s", content.getName(), e.getMessage())); error.setMessage(String.format("IOException while reading resource %s: %s", content.getName(), e.getMessage()));
result = new Result<>(Collections.singleton(error)); result = new Result<>(Collections.singleton(error));
} }
@ -78,9 +78,9 @@ public class DocumentParseAction implements CheckAction {
} }
@Override @Override
public void check(Bag results) { public void check(final Bag results) {
Result<XdmNode, XMLSyntaxError> parserResult = parseDocument(results.getInput()); final Result<XdmNode, XMLSyntaxError> parserResult = parseDocument(results.getInput());
ValidationResultsWellformedness v = new ValidationResultsWellformedness(); final ValidationResultsWellformedness v = new ValidationResultsWellformedness();
results.setParserResult(parserResult); results.setParserResult(parserResult);
v.getXmlSyntaxError().addAll(parserResult.getErrors()); v.getXmlSyntaxError().addAll(parserResult.getErrors());
results.getReportInput().setValidationResultsWellformedness(v); results.getReportInput().setValidationResultsWellformedness(v);

2
src/main/model/xsd/createReportInput.xsd
View file

@ -68,7 +68,7 @@
<xs:complexType name="XMLSyntaxError"> <xs:complexType name="XMLSyntaxError">
<xs:sequence> <xs:sequence>
<xs:element name="message" type="xs:normalizedString"/> <xs:element name="message" type="xs:normalizedString"/>
<xs:element name="getSeverityCode" type="in:XMLSyntaxErrorSeverity" /> <xs:element name="severityCode" type="in:XMLSyntaxErrorSeverity" />
<xs:element name="rowNumber" type="xs:int" minOccurs="0"/> <xs:element name="rowNumber" type="xs:int" minOccurs="0"/>
<xs:element name="columnNumber" type="xs:int" minOccurs="0"/> <xs:element name="columnNumber" type="xs:int" minOccurs="0"/>
</xs:sequence> </xs:sequence>

6
src/test/java/de/kosit/validationtool/impl/DocumentParserTest.java
View file

@ -60,7 +60,7 @@ public class DocumentParserTest {
@Test @Test
public void testSimple() { public void testSimple() {
final Result<XdmNode, XMLSyntaxError> result = this.parser.parseDocument(read(CONTENT)); final Result<XdmNode, XMLSyntaxError> result = DocumentParseAction.parseDocument(read(CONTENT));
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result.getObject()).isNotNull(); assertThat(result.getObject()).isNotNull();
assertThat(result.getErrors()).isEmpty(); assertThat(result.getErrors()).isEmpty();
@ -69,7 +69,7 @@ public class DocumentParserTest {
@Test @Test
public void testIllformed() { public void testIllformed() {
final Result<XdmNode, XMLSyntaxError> result = this.parser.parseDocument(read(ILLFORMED)); final Result<XdmNode, XMLSyntaxError> result = DocumentParseAction.parseDocument(read(ILLFORMED));
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result.getErrors()).isNotEmpty(); assertThat(result.getErrors()).isNotEmpty();
assertThat(result.getObject()).isNull(); assertThat(result.getObject()).isNull();
@ -79,7 +79,7 @@ public class DocumentParserTest {
@Test @Test
public void testNullInput() { public void testNullInput() {
this.exception.expect(IllegalArgumentException.class); this.exception.expect(IllegalArgumentException.class);
this.parser.parseDocument(null); DocumentParseAction.parseDocument(null);
} }

2
src/test/java/de/kosit/validationtool/impl/ScenarioRepositoryTest.java
View file

@ -99,7 +99,7 @@ public class ScenarioRepositoryTest {
private static XdmNode load(final URL url) throws IOException { private static XdmNode load(final URL url) throws IOException {
final DocumentParseAction p = new DocumentParseAction(); final DocumentParseAction p = new DocumentParseAction();
return p.parseDocument(read(url)).getObject(); return DocumentParseAction.parseDocument(read(url)).getObject();
} }
@Test @Test