Skip to content

Commit

Permalink
Fixed issue #626
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosjepard
carlosjepard committed Dec 20, 2024
1 parent b29577b commit 361f074
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 49 deletions.
5 changes: 5 additions & 0 deletions dbptk-modules/dbptk-module-siard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
<artifactId>dbptk-bindings-siarddk-128</artifactId>
</dependency>

<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>

<!-- misc dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
96 changes: 47 additions & 49 deletions ...rvation/modules/siard/validate/component/tableData/RequirementsForTableDataValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 <[email protected]>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>

<!-- lfaria 2024-02-14: Fixing Java 8 compatibility issue -->
<dependency>
<groupId>org.eclipse.collections</groupId>
Expand Down

0 comments on commit 361f074

Please sign in to comment.