From 83ea0a64792e07971e301f423788f68144893810 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Wed, 19 Jul 2023 11:02:27 +0200
Subject: [PATCH] - refactoring, renamed SLUBXmlErrorHandler to XmlErrorHandler

---
 .../plugin/SLUBXmlFormatValidationPlugin.java      |  4 ++--
 .../plugin/Validation/SLUBValidateDTD.java         | 10 +++++-----
 .../plugin/Validation/SLUBValidateRelaxNG.java     |  6 +++---
 .../plugin/Validation/TestSLUBValidateDTD.java     | 14 +++++++-------
 .../plugin/Validation/TestSLUBValidateRelaxNG.java |  6 +++---
 ...UBXmlErrorHandler.java => XmlErrorHandler.java} |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)
 rename java/org/slub/rosetta/dps/repository/plugin/{SLUBXmlErrorHandler.java => XmlErrorHandler.java} (85%)

diff --git a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java
index bbb7a42..613cf1a 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlFormatValidationPlugin.java
@@ -60,7 +60,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
     private ValidationCatalogResolver validationCatalogResolver; /* for DTDs */
     private ValidationResourceResolver validationResourceResolver; /* for schema/relaxNG/... */
 
-    private SLUBXmlErrorHandler validationErrorHandler;
+    private XmlErrorHandler validationErrorHandler;
     public Set<ValidationSchema> getNamespaceSchemaMap() {
         return namespaceSchemaMap;
     }
@@ -142,7 +142,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
         dbf.setValidating(false);
         dbf.setExpandEntityReferences(false);
         validationLogger = new ValidationResultHandle();
-        validationErrorHandler = new SLUBXmlErrorHandler( validationLogger);
+        validationErrorHandler = new XmlErrorHandler( validationLogger);
     }
 
     /** init params to configure the plugin via xml forms
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 a2ec9cf..d8c3f9f 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateDTD.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateDTD.java
@@ -1,6 +1,6 @@
 package org.slub.rosetta.dps.repository.plugin.Validation;
 
-import org.slub.rosetta.dps.repository.plugin.SLUBXmlErrorHandler;
+import org.slub.rosetta.dps.repository.plugin.XmlErrorHandler;
 import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
 import org.slub.rosetta.dps.repository.plugin.ValidationCatalogResolver;
 
@@ -13,12 +13,12 @@ import java.io.IOException;
 
 public class SLUBValidateDTD {
     private final ValidationCatalogResolver validationCatalogResolver;
-    private final SLUBXmlErrorHandler slubXmlErrorHandler;
+    private final XmlErrorHandler xmlErrorHandler;
     private final ValidationResultHandle logger;
 
-    public SLUBValidateDTD(ValidationCatalogResolver catalogResolver, SLUBXmlErrorHandler slubXmlErrorHandler, ValidationResultHandle logger) {
+    public SLUBValidateDTD(ValidationCatalogResolver catalogResolver, XmlErrorHandler xmlErrorHandler, ValidationResultHandle logger) {
         this.validationCatalogResolver = catalogResolver;
-        this.slubXmlErrorHandler = slubXmlErrorHandler;
+        this.xmlErrorHandler = xmlErrorHandler;
         this.logger = logger;
     }
     private final DocumentBuilderFactory dbf = DocumentBuilderFactory.newDefaultNSInstance();
@@ -34,7 +34,7 @@ public class SLUBValidateDTD {
         assert (dbValidate.isValidating());
         //reportDetail("align entitity resolver");
         dbValidate.setEntityResolver(validationCatalogResolver);
-        dbValidate.setErrorHandler(slubXmlErrorHandler);
+        dbValidate.setErrorHandler(xmlErrorHandler);
         //reportDetail("reparse using own catalog");
         try {
             dbValidate.parse(new File(filePath));
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 1c832c1..d652526 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateRelaxNG.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/SLUBValidateRelaxNG.java
@@ -6,7 +6,7 @@ import com.thaiopensource.validate.SchemaReader;
 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.XmlErrorHandler;
 import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -18,8 +18,8 @@ import java.net.URI;
 public class SLUBValidateRelaxNG {
 
     private final ValidationResultHandle logger;
-    private final SLUBXmlErrorHandler errorHandler;
-    public SLUBValidateRelaxNG(SLUBXmlErrorHandler errorHandler, ValidationResultHandle logger) {
+    private final XmlErrorHandler errorHandler;
+    public SLUBValidateRelaxNG(XmlErrorHandler errorHandler, ValidationResultHandle logger) {
         this.logger = logger;
         this.errorHandler = errorHandler;
     }
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 67ff534..86db987 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateDTD.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateDTD.java
@@ -3,7 +3,7 @@ package org.slub.rosetta.dps.repository.plugin.Validation;
 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.XmlErrorHandler;
 import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
 import org.slub.rosetta.dps.repository.plugin.ValidationCatalogResolver;
 import org.slub.rosetta.dps.repository.plugin.ValidationLevel;
@@ -36,7 +36,7 @@ public class TestSLUBValidateDTD {
         };
         ValidationResultHandle logger = new ValidationResultHandle();
         ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
         assertNotNull( "validator DTD sucessfully instantiated", v);
         var has_exception = false;
@@ -58,7 +58,7 @@ public class TestSLUBValidateDTD {
         };
         ValidationResultHandle logger = new ValidationResultHandle();
         ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler( logger );
+        XmlErrorHandler errorHandler = new XmlErrorHandler( logger );
         var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
         assertNotNull( "validator DTD sucessfully instantiated", v);
         var has_exception = false;
@@ -84,7 +84,7 @@ public class TestSLUBValidateDTD {
 
         ValidationResultHandle logger = new ValidationResultHandle();
         ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
         assertNotNull( "validator DTD sucessfully instantiated", v);
         var has_exception = false;
@@ -110,7 +110,7 @@ public class TestSLUBValidateDTD {
         };
         ValidationResultHandle logger = new ValidationResultHandle();
         ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateDTD( validationCatalogResolver , errorHandler, logger);
         assertNotNull( "validator DTD sucessfully instantiated", v);
         var has_exception = false;
@@ -135,7 +135,7 @@ public class TestSLUBValidateDTD {
         String[] catalogs = new String[0];
         ValidationResultHandle logger = new ValidationResultHandle();
         ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler, logger );
         assertNotNull( "validator DTD sucessfully instantiated", v);
         var has_exception = false;
@@ -160,7 +160,7 @@ public class TestSLUBValidateDTD {
         };
         ValidationResultHandle logger = new ValidationResultHandle();
         ValidationCatalogResolver validationCatalogResolver = new ValidationCatalogResolver(catalogs, logger);
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateDTD( validationCatalogResolver, errorHandler , logger);
         assertNotNull( "validator DTD sucessfully instantiated", v);
         var has_exception = false;
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 da372e9..5de2501 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateRelaxNG.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestSLUBValidateRelaxNG.java
@@ -3,7 +3,7 @@ package org.slub.rosetta.dps.repository.plugin.Validation;
 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.XmlErrorHandler;
 import org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin;
 import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
 import org.w3c.dom.Document;
@@ -51,7 +51,7 @@ public class TestSLUBValidateRelaxNG {
     @org.junit.Test
     public void relaxNG_valid() {
         ValidationResultHandle logger = new ValidationResultHandle();
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateRelaxNG(errorHandler, logger);
         assertNotNull( "validator relaxNG sucessfully instantiated", v);
         var has_exception = false;
@@ -69,7 +69,7 @@ public class TestSLUBValidateRelaxNG {
     @org.junit.Test
     public void relaxNG_invalid() {
         ValidationResultHandle logger = new ValidationResultHandle();
-        SLUBXmlErrorHandler errorHandler = new SLUBXmlErrorHandler(logger);
+        XmlErrorHandler errorHandler = new XmlErrorHandler(logger);
         var v = new SLUBValidateRelaxNG(errorHandler, logger);
         assertNotNull( "validator relaxNG sucessfully instantiated", v);
         var has_exception = false;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java b/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java
similarity index 85%
rename from java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java
rename to java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java
index c8f77f5..adf7706 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/SLUBXmlErrorHandler.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java
@@ -3,11 +3,11 @@ package org.slub.rosetta.dps.repository.plugin;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
-public class SLUBXmlErrorHandler implements ErrorHandler {
+public class XmlErrorHandler implements ErrorHandler {
 
 
     private final ValidationResultHandle resultHandle;
-    public SLUBXmlErrorHandler( ValidationResultHandle resultHandle) {
+    public XmlErrorHandler(ValidationResultHandle resultHandle) {
         this.resultHandle = resultHandle;
     }
 
-- 
GitLab