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

04-UpdateDependencies

Browse source
This commit is contained in:
Adrian-Devries 2025-04-24 12:53:54 +02:00
parent 04a236ec83
commit 20ba488353
10 changed files with 112 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
View file

@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable<ReturnValue> {
private static void configureLogging(final CommandLineOptions cmd) {
if (cmd.isDebugLog()) {
System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
} else {
System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name());
System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name());
}
}

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

@ -114,7 +114,7 @@ class XPathBuilder implements Builder<XPathExecutable> {
final Iterable<String> iterable = () -> iterator;
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)));
.getRetainedStaticContext().getURIForPrefix(e, false).toString()));
getNamespaces().putAll(ns);
}

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

@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.StringJoiner;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
import jakarta.xml.bind.ValidationEvent;
import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;

16
src/main/java/de/kosit/validationtool/impl/ConversionService.java
View file

@ -24,14 +24,14 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.StringJoiner;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.JAXBIntrospector;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.ValidationEventHandler;
import javax.xml.bind.annotation.XmlRegistry;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.JAXBIntrospector;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.ValidationEventHandler;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;

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

@ -21,7 +21,7 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import java.io.IOException;
import java.nio.charset.Charset;
import javax.xml.bind.util.JAXBSource;
import jakarta.xml.bind.util.JAXBSource;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
@ -43,7 +43,7 @@ import net.sf.saxon.om.TreeInfo;
* <ul>
* <li>{@link StreamSource} - both {@link java.io.InputStream} based and {@link java.io.Reader} based</li>
* <li>{@link javax.xml.transform.dom.DOMSource}</li>
* <li>{@link javax.xml.bind.util.JAXBSource}</li>
* <li>{@link jakarta.xml.bind.util.JAXBSource}</li>
* <li>{@link TreeInfo}</li>
* </ul>
*

6
src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java
View file

@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.Collection;
import java.util.stream.Collectors;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.util.JAXBSource;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.util.JAXBSource;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;

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

@ -16,7 +16,7 @@
package de.kosit.validationtool.impl.xml;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StringTrimAdapter extends XmlAdapter<String, String> {

73
src/main/model/binding/global.xjb
View file

@ -16,45 +16,98 @@
-->
<jaxb:bindings
xmlns:annox="urn:jaxb.jvnet.org:annox"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance"
jaxb:extensionBindingPrefixes="inheritance"
version="2.1">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance"
jaxb:extensionBindingPrefixes="xjc annox inheritance"
version="3.0">
<jaxb:globalBindings>
<xjc:serializable uid="-1" />
<xjc:javaType
name="java.lang.String"
xmlType="xs:string"
adapter="de.kosit.validationtool.impl.xml.StringTrimAdapter" />
</jaxb:globalBindings>
<jaxb:bindings schemaLocation="../xsd/createReportInput.xsd">
<jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.model.reportInput"/>
</jaxb:schemaBindings>
<jaxb:bindings node="/xs:schema/xs:element[@name='createReportInput']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='Document']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='EngineType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ValidationResultsWellformedness']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ValidationResultsXmlSchema']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ProcessingError']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="//xs:complexType[@name='XMLSyntaxError']">
<inheritance:extends>de.kosit.validationtool.impl.model.BaseXMLSyntaxError</inheritance:extends>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/scenarios.xsd">
<jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.model.scenarios"/>
</jaxb:schemaBindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='CreateReportType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='CustomErrorLevel']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='DescriptionType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ScenarioType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:element[@name='scenarios']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ValidateWithXmlSchema']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/assertions.xsd">
<jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.cmd.assertions" />
</jaxb:schemaBindings>
</jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/svrl-kosit.xsd">
<jaxb:bindings node="//xs:element[@name='schematron-output']/xs:complexType">
<inheritance:extends>de.kosit.validationtool.impl.model.BaseOutput</inheritance:extends>
<jaxb:bindings node="/xs:schema/xs:element[@name='assertions']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/svrl-kosit.xsd">
<jaxb:bindings node="/xs:schema/xs:element[@name='failed-assert']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='rich-text']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="//xs:element[@name='schematron-output']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
<inheritance:extends>de.kosit.validationtool.impl.model.BaseOutput</inheritance:extends>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:element[@name='successful-report']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/daemon.xsd">
<jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.model.daemon" />

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

@ -77,7 +77,7 @@ public class CreateReportActionTest {
this.action.check(bag);
assertThat(bag.getReport()).isNotNull();
final String reportString = serialize(bag.getReport());
assertThat(reportString).contains("SAXParseException");
assertThat(reportString).contains("SXXP0003");
}
@Test