Skip to content
Snippets Groups Projects
Commit 65ad9bc4 authored by Andreas Romeyke's avatar Andreas Romeyke
Browse files

- refactoring, renamed Validation/SLUBValidation... to Validation/Validation...

parent 0c8db871
No related branches found
No related tags found
No related merge requests found
......@@ -14,13 +14,13 @@ import java.util.Map;
import static org.junit.Assert.*;
/**
* Tests for {@link SLUBValidateDTD}.
* Tests for {@link ValidateDTD}.
*
* @author andreas.romeyke@slub-dresden.de (Andreas Romeyke)
*/
@RunWith(JUnit4.class)
public class TestSLUBValidateDTD {
public class TestValidateDTD {
private final Map<String, String> initp = new HashMap<>();
@Before
......@@ -37,7 +37,7 @@ public class TestSLUBValidateDTD {
ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
var v = new ValidateDTD( validationCatalogResolver, errorHandler, logger );
assertNotNull( "validator DTD sucessfully instantiated", v);
var has_exception = false;
boolean res = false;
......@@ -59,7 +59,7 @@ public class TestSLUBValidateDTD {
ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
XmlErrorHandler errorHandler = new XmlErrorHandler( logger );
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
var v = new ValidateDTD( validationCatalogResolver, errorHandler, logger );
assertNotNull( "validator DTD sucessfully instantiated", v);
var has_exception = false;
boolean res = false;
......@@ -85,7 +85,7 @@ public class TestSLUBValidateDTD {
ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
var v = new ValidateDTD( validationCatalogResolver, errorHandler, logger );
assertNotNull( "validator DTD sucessfully instantiated", v);
var has_exception = false;
boolean res = false;
......@@ -111,7 +111,7 @@ public class TestSLUBValidateDTD {
ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver , errorHandler, logger);
var v = new ValidateDTD( validationCatalogResolver , errorHandler, logger);
assertNotNull( "validator DTD sucessfully instantiated", v);
var has_exception = false;
boolean res = false;
......@@ -136,7 +136,7 @@ public class TestSLUBValidateDTD {
ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
var v = new ValidateDTD( validationCatalogResolver, errorHandler, logger );
assertNotNull( "validator DTD sucessfully instantiated", v);
var has_exception = false;
boolean res = false;
......@@ -161,7 +161,7 @@ public class TestSLUBValidateDTD {
ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler , logger);
var v = new ValidateDTD( validationCatalogResolver, errorHandler , logger);
assertNotNull( "validator DTD sucessfully instantiated", v);
var has_exception = false;
boolean res = false;
......
......@@ -17,13 +17,13 @@ import java.util.Map;
import static org.junit.Assert.*;
/**
* Tests for {@link SLUBValidateRelaxNG}.
* Tests for {@link ValidateRelaxNG}.
*
* @author andreas.romeyke@slub-dresden.de (Andreas Romeyke)
*/
@RunWith(JUnit4.class)
public class TestSLUBValidateRelaxNG {
public class TestValidateRelaxNG {
private static XmlFormatValidationPlugin mock;
private final Map<String, String> initp = new HashMap<>();
......@@ -52,7 +52,7 @@ public class TestSLUBValidateRelaxNG {
public void relaxNG_valid() {
ValidationResultHandle logger = new ValidationResultHandle();
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateRelaxNG(errorHandler, logger);
var v = new ValidateRelaxNG(errorHandler, logger);
assertNotNull( "validator relaxNG sucessfully instantiated", v);
var has_exception = false;
var res = false;
......@@ -70,7 +70,7 @@ public class TestSLUBValidateRelaxNG {
public void relaxNG_invalid() {
ValidationResultHandle logger = new ValidationResultHandle();
XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
var v = new SLUBValidateRelaxNG(errorHandler, logger);
var v = new ValidateRelaxNG(errorHandler, logger);
assertNotNull( "validator relaxNG sucessfully instantiated", v);
var has_exception = false;
var res = false;
......
......@@ -19,13 +19,13 @@ import java.util.Set;
import static org.junit.Assert.*;
/**
* Tests for {@link SLUBValidateSchema}.
* Tests for {@link ValidateSchema}.
*
* @author andreas.romeyke@slub-dresden.de (Andreas Romeyke)
*/
@RunWith(JUnit4.class)
public class TestSLUBValidateSchema {
public class TestValidateSchema {
private static XmlFormatValidationPlugin mock;
private final Map<String, String> initp = new HashMap<>();
......@@ -55,7 +55,7 @@ public class TestSLUBValidateSchema {
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
ValidationResultHandle logger = new ValidationResultHandle();
var v = new SLUBValidateSchema(validationResourceResolver, logger);
var v = new ValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
var res = false;
......@@ -74,7 +74,7 @@ public class TestSLUBValidateSchema {
public void schema_invalid() {
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
ValidationResultHandle logger = new ValidationResultHandle();
var v = new SLUBValidateSchema(validationResourceResolver, logger);
var v = new ValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
var res = false;
......@@ -102,7 +102,7 @@ public class TestSLUBValidateSchema {
}
ValidationResultHandle logger = new ValidationResultHandle();
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm, true);
var v = new SLUBValidateSchema(validationResourceResolver, logger);
var v = new ValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
var res = false;
......
......@@ -11,12 +11,12 @@ import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
public class SLUBValidateDTD {
public class ValidateDTD {
private final ValidationCatalogResolver validationCatalogResolver;
private final XmlErrorHandler xmlErrorHandler;
private final ValidationResultHandle logger;
public SLUBValidateDTD(ValidationCatalogResolver catalogResolver, XmlErrorHandler xmlErrorHandler, ValidationResultHandle logger) {
public ValidateDTD(ValidationCatalogResolver catalogResolver, XmlErrorHandler xmlErrorHandler, ValidationResultHandle logger) {
this.validationCatalogResolver = catalogResolver;
this.xmlErrorHandler = xmlErrorHandler;
this.logger = logger;
......
......@@ -15,11 +15,11 @@ import org.xml.sax.SAXException;
import java.io.IOException;
import java.net.URI;
public class SLUBValidateRelaxNG {
public class ValidateRelaxNG {
private final ValidationResultHandle logger;
private final XmlErrorHandler errorHandler;
public SLUBValidateRelaxNG(XmlErrorHandler errorHandler, ValidationResultHandle logger) {
public ValidateRelaxNG(XmlErrorHandler errorHandler, ValidationResultHandle logger) {
this.logger = logger;
this.errorHandler = errorHandler;
}
......
......@@ -19,13 +19,13 @@ import java.net.URI;
public class SLUBValidateSchema {
public class ValidateSchema {
private final ValidationResourceResolver validationResourceResolver;
private final ValidationResultHandle logger;
private boolean validationResult=true;
public SLUBValidateSchema(ValidationResourceResolver validationResourceResolver, ValidationResultHandle validationLogger) {
public ValidateSchema(ValidationResourceResolver validationResourceResolver, ValidationResultHandle validationLogger) {
this.validationResourceResolver = validationResourceResolver;
this.logger = validationLogger;
}
......@@ -59,7 +59,7 @@ public class SLUBValidateSchema {
private boolean internValidateFormatAgainstSchemaRecursively(Node root, ValidationSchema validationSchema) throws IOException, SAXException {
var schemaType = validationSchema.schemaType;
if (schemaType == ValidationSchemaType.schema) {
SLUBValidateSchema validator = new SLUBValidateSchema( validationResourceResolver, logger );
ValidateSchema validator = new ValidateSchema( validationResourceResolver, logger );
// Select validation roots from DOM
validationResult = validator.validateAgainst(root, validationSchema.schemaURI);
logger.debug("RECURSIVE SCHEMA VALIDATOR: validation against Schema "+ validationSchema.schemaURI.toString() + " results in " + validationResult);
......
......@@ -12,7 +12,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
public class SLUBValidateSchematron {
public class ValidateSchematron {
private final List<String> errors = new ArrayList<>();
public List<String> get_errors() {
......
......@@ -18,10 +18,10 @@ package org.slub.rosetta.dps.repository.plugin;
import com.exlibris.core.infra.common.exceptions.logging.ExLogger;
import com.exlibris.dps.sdk.techmd.FormatValidationPlugin;
import org.slub.rosetta.dps.repository.plugin.Validation.SLUBValidateDTD;
import org.slub.rosetta.dps.repository.plugin.Validation.SLUBValidateRelaxNG;
import org.slub.rosetta.dps.repository.plugin.Validation.SLUBValidateSchema;
import org.slub.rosetta.dps.repository.plugin.Validation.SLUBValidateSchematron;
import org.slub.rosetta.dps.repository.plugin.Validation.ValidateDTD;
import org.slub.rosetta.dps.repository.plugin.Validation.ValidateRelaxNG;
import org.slub.rosetta.dps.repository.plugin.Validation.ValidateSchema;
import org.slub.rosetta.dps.repository.plugin.Validation.ValidateSchematron;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
......@@ -259,19 +259,19 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
Document doc = getDocument(filePath);
switch (schemaType) {
case dtd -> {
SLUBValidateDTD validator = new SLUBValidateDTD(validationCatalogResolver, validationErrorHandler, validationLogger);
ValidateDTD validator = new ValidateDTD(validationCatalogResolver, validationErrorHandler, validationLogger);
valid = validator.validateAgainst(filePath);
}
case schema -> {
SLUBValidateSchema validator = new SLUBValidateSchema(validationResourceResolver, validationLogger);
ValidateSchema validator = new ValidateSchema(validationResourceResolver, validationLogger);
valid = validator.validateFormatAgainstSchemaRecursively(doc, validationSchema);
}
case relaxng -> {
SLUBValidateRelaxNG validator = new SLUBValidateRelaxNG(validationErrorHandler, validationLogger);
ValidateRelaxNG validator = new ValidateRelaxNG(validationErrorHandler, validationLogger);
valid = validator.validateAgainst(doc, validationSchema.schemaURI);
}
case schematron -> {
SLUBValidateSchematron validator = new SLUBValidateSchematron();
ValidateSchematron validator = new ValidateSchematron();
valid = validator.validateAgainst(doc, validationSchema.schemaURI);
validationLogger.error("unsupported schematron schema uri=" + validationSchema.schemaURI + " of type: " + validationSchema.schemaType);
valid = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment