From 7ba7c84533121bee9705b99b2a4999dbc7ad8857 Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Fri, 17 May 2019 14:05:48 +0200 Subject: [PATCH] (fix) names --- .../impl/CollectingErrorEventHandler.java | 4 ++-- .../impl/ScenarioRepository.java | 2 +- .../impl/tasks/DocumentParseAction.java | 18 +++++++++--------- src/main/model/xsd/createReportInput.xsd | 2 +- .../impl/DocumentParserTest.java | 6 +++--- .../impl/ScenarioRepositoryTest.java | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java index d88c940..b1daca8 100644 --- a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java +++ b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java @@ -57,7 +57,7 @@ public class CollectingErrorEventHandler implements ValidationEventHandler, Erro private static XMLSyntaxError createError(final XMLSyntaxErrorSeverity severity, final String message) { final XMLSyntaxError e = new XMLSyntaxError(); - e.setSeverity(severity); + e.setSeverityCode(severity); e.setMessage(message); return e; } @@ -141,7 +141,7 @@ public class CollectingErrorEventHandler implements ValidationEventHandler, Erro e.setRowNumber(locator.getLineNumber()); } 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 diff --git a/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java b/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java index 3fea7e4..575cf42 100644 --- a/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java +++ b/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java @@ -94,7 +94,7 @@ public class ScenarioRepository { private static void checkVersion(final URI scenarioDefinition) { final DocumentParseAction p = new DocumentParseAction(); try { - final Result result = p.parseDocument(InputFactory.read(scenarioDefinition.toURL())); + final Result result = DocumentParseAction.parseDocument(InputFactory.read(scenarioDefinition.toURL())); if (result.isValid() && !isSupportedDocument(result.getObject())) { throw new IllegalStateException(String.format( "Specified scenario configuration %s is not supported.%nThis version only supports definitions of '%s'", diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java index 97f99f6..c141413 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java @@ -56,20 +56,20 @@ public class DocumentParseAction implements CheckAction { * @param content ein Dokument * @return Ergebnis des Parsings inklusive etwaiger Fehler */ - public Result parseDocument(Input content) { + public static Result parseDocument(final Input content) { if (content == null) { throw new IllegalArgumentException("Input may not be null"); } Result result; - try ( InputStream input = new ByteArrayInputStream(content.getContent()) ) { + try ( final InputStream input = new ByteArrayInputStream(content.getContent()) ) { final DocumentBuilder builder = ObjectFactory.createProcessor().newDocumentBuilder(); builder.setLineNumbering(true); - XdmNode doc = builder.build(new StreamSource(input)); + final XdmNode doc = builder.build(new StreamSource(input)); result = new Result<>(doc, Collections.emptyList()); - } catch (SaxonApiException | IOException e) { + } catch (final SaxonApiException | IOException e) { log.debug("Exception while parsing {}", content.getName(), e); - XMLSyntaxError error = new XMLSyntaxError(); - error.setSeverity(XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR); + final XMLSyntaxError error = new XMLSyntaxError(); + error.setSeverityCode(XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR); error.setMessage(String.format("IOException while reading resource %s: %s", content.getName(), e.getMessage())); result = new Result<>(Collections.singleton(error)); } @@ -78,9 +78,9 @@ public class DocumentParseAction implements CheckAction { } @Override - public void check(Bag results) { - Result parserResult = parseDocument(results.getInput()); - ValidationResultsWellformedness v = new ValidationResultsWellformedness(); + public void check(final Bag results) { + final Result parserResult = parseDocument(results.getInput()); + final ValidationResultsWellformedness v = new ValidationResultsWellformedness(); results.setParserResult(parserResult); v.getXmlSyntaxError().addAll(parserResult.getErrors()); results.getReportInput().setValidationResultsWellformedness(v); diff --git a/src/main/model/xsd/createReportInput.xsd b/src/main/model/xsd/createReportInput.xsd index 07bf634..9cc0390 100644 --- a/src/main/model/xsd/createReportInput.xsd +++ b/src/main/model/xsd/createReportInput.xsd @@ -68,7 +68,7 @@ - + diff --git a/src/test/java/de/kosit/validationtool/impl/DocumentParserTest.java b/src/test/java/de/kosit/validationtool/impl/DocumentParserTest.java index c6b8fd7..6f4e01c 100644 --- a/src/test/java/de/kosit/validationtool/impl/DocumentParserTest.java +++ b/src/test/java/de/kosit/validationtool/impl/DocumentParserTest.java @@ -60,7 +60,7 @@ public class DocumentParserTest { @Test public void testSimple() { - final Result result = this.parser.parseDocument(read(CONTENT)); + final Result result = DocumentParseAction.parseDocument(read(CONTENT)); assertThat(result).isNotNull(); assertThat(result.getObject()).isNotNull(); assertThat(result.getErrors()).isEmpty(); @@ -69,7 +69,7 @@ public class DocumentParserTest { @Test public void testIllformed() { - final Result result = this.parser.parseDocument(read(ILLFORMED)); + final Result result = DocumentParseAction.parseDocument(read(ILLFORMED)); assertThat(result).isNotNull(); assertThat(result.getErrors()).isNotEmpty(); assertThat(result.getObject()).isNull(); @@ -79,7 +79,7 @@ public class DocumentParserTest { @Test public void testNullInput() { this.exception.expect(IllegalArgumentException.class); - this.parser.parseDocument(null); + DocumentParseAction.parseDocument(null); } diff --git a/src/test/java/de/kosit/validationtool/impl/ScenarioRepositoryTest.java b/src/test/java/de/kosit/validationtool/impl/ScenarioRepositoryTest.java index 0238f41..a261f43 100644 --- a/src/test/java/de/kosit/validationtool/impl/ScenarioRepositoryTest.java +++ b/src/test/java/de/kosit/validationtool/impl/ScenarioRepositoryTest.java @@ -99,7 +99,7 @@ public class ScenarioRepositoryTest { private static XdmNode load(final URL url) throws IOException { final DocumentParseAction p = new DocumentParseAction(); - return p.parseDocument(read(url)).getObject(); + return DocumentParseAction.parseDocument(read(url)).getObject(); } @Test