From e83fd57358019af833ec1e155bcaded387c787db Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Wed, 19 Jul 2023 11:00:53 +0200
Subject: [PATCH] - refactoring, renamed SLUBXmlValidationLogger to
ValidationResultHandle
---
.../dps/repository/plugin/SLUBXmlErrorHandler.java | 14 +++++++-------
.../plugin/SLUBXmlFormatValidationPlugin.java | 4 ++--
.../plugin/Validation/SLUBValidateDTD.java | 6 +++---
.../plugin/Validation/SLUBValidateRelaxNG.java | 6 +++---
.../plugin/Validation/SLUBValidateSchema.java | 6 +++---
.../plugin/Validation/TestSLUBValidateDTD.java | 14 +++++++-------
.../plugin/Validation/TestSLUBValidateRelaxNG.java | 6 +++---
.../plugin/Validation/TestSLUBValidateSchema.java | 8 ++++----
.../plugin/ValidationCatalogResolver.java | 4 ++--
...tionLogger.java => ValidationResultHandle.java} | 4 ++--
10 files changed, 36 insertions(+), 36 deletions(-)
rename java/org/slub/rosetta/dps/repository/plugin/{SLUBXmlValidationLogger.java => ValidationResultHandle.java} (96%)
diff --git a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java b/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java
index a6d4b0f..c8f77f5 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java
@@ -6,24 +6,24 @@ import org.xml.sax.SAXParseException;
public class SLUBXmlErrorHandler implements ErrorHandler {
- private final SLUBXmlValidationLogger logger;
- public SLUBXmlErrorHandler( SLUBXmlValidationLogger logger) {
- this.logger = logger;
+ private final ValidationResultHandle resultHandle;
+ public SLUBXmlErrorHandler( ValidationResultHandle resultHandle) {
+ this.resultHandle = resultHandle;
}
@Override
public void warning(SAXParseException e) {
- logger.warning( e.getMessage());
+ resultHandle.warning( e.getMessage());
}
@Override
public void error(SAXParseException e) {
- logger.error(e.getMessage() + " line=" + e.getLineNumber() + " col=" + e.getColumnNumber());
+ resultHandle.error(e.getMessage() + " line=" + e.getLineNumber() + " col=" + e.getColumnNumber());
}
@Override
public void fatalError(SAXParseException e) {
- logger.fatal(e.getMessage() + " line=" + e.getLineNumber() + " col=" + e.getColumnNumber());
+ resultHandle.fatal(e.getMessage() + " line=" + e.getLineNumber() + " col=" + e.getColumnNumber());
}
public boolean is_Valid() {
- return logger.getResult();
+ return resultHandle.getResult();
}
}
diff --git a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java
index e3728d7..bbb7a42 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java
@@ -51,7 +51,7 @@ import java.util.Set;
*/
public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
private static final ExLogger log = ExLogger.getExLogger(SLUBXmlFormatValidationPlugin.class);
- private SLUBXmlValidationLogger validationLogger;
+ private ValidationResultHandle validationLogger;
private boolean debug;
private boolean valid;
private boolean wellformed;
@@ -141,7 +141,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
dbf.setNamespaceAware(true);
dbf.setValidating(false);
dbf.setExpandEntityReferences(false);
- validationLogger = new SLUBXmlValidationLogger();
+ validationLogger = new ValidationResultHandle();
validationErrorHandler = new SLUBXmlErrorHandler( validationLogger);
}
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateDTD.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateDTD.java
index 9f97a6d..a2ec9cf 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateDTD.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateDTD.java
@@ -1,7 +1,7 @@
package org.slub.rosetta.dps.repository.plugin.Validation;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlErrorHandler;
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlValidationLogger;
+import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.slub.rosetta.dps.repository.plugin.ValidationCatalogResolver;
import javax.xml.XMLConstants;
@@ -14,9 +14,9 @@ import java.io.IOException;
public class SLUBValidateDTD {
private final ValidationCatalogResolver validationCatalogResolver;
private final SLUBXmlErrorHandler slubXmlErrorHandler;
- private final SLUBXmlValidationLogger logger;
+ private final ValidationResultHandle logger;
- public SLUBValidateDTD(ValidationCatalogResolver catalogResolver, SLUBXmlErrorHandler slubXmlErrorHandler, SLUBXmlValidationLogger logger) {
+ public SLUBValidateDTD(ValidationCatalogResolver catalogResolver, SLUBXmlErrorHandler slubXmlErrorHandler, ValidationResultHandle logger) {
this.validationCatalogResolver = catalogResolver;
this.slubXmlErrorHandler = slubXmlErrorHandler;
this.logger = logger;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateRelaxNG.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateRelaxNG.java
index f997b9a..1c832c1 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateRelaxNG.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateRelaxNG.java
@@ -7,7 +7,7 @@ import com.thaiopensource.validate.ValidateProperty;
import com.thaiopensource.validate.ValidationDriver;
import com.thaiopensource.validate.auto.AutoSchemaReader;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlErrorHandler;
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlValidationLogger;
+import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -17,9 +17,9 @@ import java.net.URI;
public class SLUBValidateRelaxNG {
- private final SLUBXmlValidationLogger logger;
+ private final ValidationResultHandle logger;
private final SLUBXmlErrorHandler errorHandler;
- public SLUBValidateRelaxNG(SLUBXmlErrorHandler errorHandler, SLUBXmlValidationLogger logger) {
+ public SLUBValidateRelaxNG(SLUBXmlErrorHandler errorHandler, ValidationResultHandle logger) {
this.logger = logger;
this.errorHandler = errorHandler;
}
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateSchema.java
index 34b972f..c7ece78 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateSchema.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateSchema.java
@@ -1,7 +1,7 @@
package org.slub.rosetta.dps.repository.plugin.Validation;
import org.apache.xerces.jaxp.validation.XMLSchemaFactory;
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlValidationLogger;
+import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.slub.rosetta.dps.repository.plugin.ValidationResourceResolver;
import org.slub.rosetta.dps.repository.plugin.ValidationSchema;
import org.slub.rosetta.dps.repository.plugin.ValidationSchemaType;
@@ -22,10 +22,10 @@ import java.net.URI;
public class SLUBValidateSchema {
private final ValidationResourceResolver validationResourceResolver;
- private final SLUBXmlValidationLogger logger;
+ private final ValidationResultHandle logger;
private boolean validationResult=true;
- public SLUBValidateSchema(ValidationResourceResolver validationResourceResolver, SLUBXmlValidationLogger validationLogger) {
+ public SLUBValidateSchema(ValidationResourceResolver validationResourceResolver, ValidationResultHandle validationLogger) {
this.validationResourceResolver = validationResourceResolver;
this.logger = validationLogger;
}
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateDTD.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateDTD.java
index 12824bf..67ff534 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateDTD.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateDTD.java
@@ -4,7 +4,7 @@ import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlErrorHandler;
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlValidationLogger;
+import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.slub.rosetta.dps.repository.plugin.ValidationCatalogResolver;
import org.slub.rosetta.dps.repository.plugin.ValidationLevel;
@@ -34,7 +34,7 @@ public class TestSLUBValidateDTD {
String[] catalogs = new String[] {
initp.get("catalog")
};
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
@@ -56,7 +56,7 @@ public class TestSLUBValidateDTD {
String[] catalogs = new String[] {
initp.get("catalog")
};
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler( logger );
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
@@ -82,7 +82,7 @@ public class TestSLUBValidateDTD {
initp.get("catalog")
};
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
@@ -108,7 +108,7 @@ public class TestSLUBValidateDTD {
String[] catalogs = new String[] {
initp.get("catalog")
};
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver , errorHandler, logger);
@@ -133,7 +133,7 @@ public class TestSLUBValidateDTD {
/** regression: check if no catalog entry the validation fails as expected */
public void check_whitelist_regression() {
String[] catalogs = new String[0];
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
@@ -158,7 +158,7 @@ public class TestSLUBValidateDTD {
String[] catalogs = new String[] {
"resources/test/catalog/import_regression.catalog"
};
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler , logger);
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateRelaxNG.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateRelaxNG.java
index 2d95e38..da372e9 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateRelaxNG.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateRelaxNG.java
@@ -5,7 +5,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlErrorHandler;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin;
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlValidationLogger;
+import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.w3c.dom.Document;
import java.io.File;
@@ -50,7 +50,7 @@ public class TestSLUBValidateRelaxNG {
@org.junit.Test
public void relaxNG_valid() {
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateRelaxNG(errorHandler, logger);
assertNotNull( "validator relaxNG sucessfully instantiated", v);
@@ -68,7 +68,7 @@ public class TestSLUBValidateRelaxNG {
}
@org.junit.Test
public void relaxNG_invalid() {
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
var v = new SLUBValidateRelaxNG(errorHandler, logger);
assertNotNull( "validator relaxNG sucessfully instantiated", v);
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateSchema.java
index 389ef67..4e197ff 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateSchema.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateSchema.java
@@ -4,7 +4,7 @@ import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin;
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlValidationLogger;
+import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.slub.rosetta.dps.repository.plugin.ValidationResourceResolver;
import org.slub.rosetta.dps.repository.plugin.ValidationSchema;
@@ -54,7 +54,7 @@ public class TestSLUBValidateSchema {
public void schema_valid() {
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
var v = new SLUBValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
@@ -73,7 +73,7 @@ public class TestSLUBValidateSchema {
@org.junit.Test
public void schema_invalid() {
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
var v = new SLUBValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
@@ -100,7 +100,7 @@ public class TestSLUBValidateSchema {
nssm.add(val);
}
}
- SLUBXmlValidationLogger logger = new SLUBXmlValidationLogger();
+ ValidationResultHandle logger = new ValidationResultHandle();
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm, true);
var v = new SLUBValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v);
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java
index 28b4cd4..4ead729 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java
@@ -15,8 +15,8 @@ import java.util.Arrays;
public class ValidationCatalogResolver implements CatalogResolver {
private final String[] catalogs;
- private final SLUBXmlValidationLogger validationLogger;
- public ValidationCatalogResolver(String[] catalogs, SLUBXmlValidationLogger validationLogger) {
+ private final ValidationResultHandle validationLogger;
+ public ValidationCatalogResolver(String[] catalogs, ValidationResultHandle validationLogger) {
this.catalogs = catalogs;
this.validationLogger = validationLogger;
}
diff --git a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlValidationLogger.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java
similarity index 96%
rename from java/org/slub/rosetta/dps/repository/plugin/SLUBXmlValidationLogger.java
rename to java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java
index 66a4c9e..6c163a1 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlValidationLogger.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java
@@ -3,10 +3,10 @@ package org.slub.rosetta.dps.repository.plugin;
import java.util.ArrayList;
import java.util.List;
-public class SLUBXmlValidationLogger {
+public class ValidationResultHandle {
private final List<String> log = new ArrayList<>();
private boolean result = true;
- private boolean isDebug;
+
public void error (String err) {
result = false;
log.add("[ERROR] " + err);
--
GitLab