diff --git a/dbptk-modules/dbptk-module-siard/pom.xml b/dbptk-modules/dbptk-module-siard/pom.xml index f8ab8dc4..6863e1e1 100644 --- a/dbptk-modules/dbptk-module-siard/pom.xml +++ b/dbptk-modules/dbptk-module-siard/pom.xml @@ -45,6 +45,11 @@ dbptk-bindings-siarddk-128 + + xerces + xercesImpl + + org.apache.commons diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java index a96e2951..894b9b25 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java @@ -7,10 +7,51 @@ */ package com.databasepreservation.modules.siard.validate.component.tableData; -import static javax.xml.stream.XMLStreamConstants.CHARACTERS; -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import com.databasepreservation.Constants; +import com.databasepreservation.model.exception.ModuleException; +import com.databasepreservation.model.exception.validator.CategoryNotFoundException; +import com.databasepreservation.model.exception.validator.XMLFileNotFoundException; +import com.databasepreservation.model.reporters.ValidationReporterStatus; +import com.databasepreservation.model.validator.SIARDContent; +import com.databasepreservation.modules.siard.validate.component.ValidatorComponentImpl; +import com.databasepreservation.modules.siard.validate.handlers.CompositePrimaryKeyValidationHandler; +import com.databasepreservation.modules.siard.validate.handlers.PrimaryKeyValidationHandler; +import com.databasepreservation.modules.siard.validate.handlers.TableContentHandler; +import com.databasepreservation.utils.ConfigUtils; +import com.databasepreservation.utils.ListUtils; +import com.databasepreservation.utils.XMLUtils; +import jakarta.xml.bind.DatatypeConverter; +import org.apache.commons.io.input.BOMInputStream; +import org.apache.commons.lang3.StringUtils; +import org.apache.xerces.jaxp.SAXParserFactoryImpl; +import org.mapdb.DB; +import org.mapdb.DBMaker; +import org.mapdb.Serializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.SAXParseException; +import org.xml.sax.XMLReader; +import javax.xml.XMLConstants; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -29,52 +70,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.XMLConstants; -import jakarta.xml.bind.DatatypeConverter; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; -import javax.xml.validation.Validator; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; - -import org.apache.commons.io.input.BOMInputStream; -import org.apache.commons.lang3.StringUtils; -import org.mapdb.DB; -import org.mapdb.DBMaker; -import org.mapdb.Serializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; -import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; - -import com.databasepreservation.Constants; -import com.databasepreservation.model.exception.ModuleException; -import com.databasepreservation.model.exception.validator.CategoryNotFoundException; -import com.databasepreservation.model.exception.validator.XMLFileNotFoundException; -import com.databasepreservation.model.reporters.ValidationReporterStatus; -import com.databasepreservation.model.validator.SIARDContent; -import com.databasepreservation.modules.siard.validate.component.ValidatorComponentImpl; -import com.databasepreservation.modules.siard.validate.handlers.CompositePrimaryKeyValidationHandler; -import com.databasepreservation.modules.siard.validate.handlers.PrimaryKeyValidationHandler; -import com.databasepreservation.modules.siard.validate.handlers.TableContentHandler; -import com.databasepreservation.utils.ConfigUtils; -import com.databasepreservation.utils.ListUtils; -import com.databasepreservation.utils.XMLUtils; -import com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl; +import static javax.xml.stream.XMLStreamConstants.CHARACTERS; +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; /** * @author Miguel GuimarĂ£es diff --git a/pom.xml b/pom.xml index c7177658..0b66f355 100644 --- a/pom.xml +++ b/pom.xml @@ -423,6 +423,12 @@ test + + xerces + xercesImpl + 2.12.2 + + org.eclipse.collections