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

- refactoring, renamed SLUBXmlFormatValidationPlugin to XmlFormatValidationPlugin

parent 83ea0a64
Branches
Tags
No related merge requests found
Main-Class: org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin Main-Class: org.slub.rosetta.dps.repository.plugin.XmlFormatValidationPlugin
<pl:metadata-config xmlns:pl="http://www.exlibrisgroup.com/Plugins/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <pl:metadata-config xmlns:pl="http://www.exlibrisgroup.com/Plugins/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<pl:pluginTypeName>FormatValidationPlugin</pl:pluginTypeName> <pl:pluginTypeName>FormatValidationPlugin</pl:pluginTypeName>
<pl:deployName>SLUBXmlFormatValidationPlugin</pl:deployName> <pl:deployName>SLUBXmlFormatValidationPlugin</pl:deployName>
<pl:className>org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin</pl:className> <pl:className>org.slub.rosetta.dps.repository.plugin.XmlFormatValidationPlugin</pl:className>
<pl:initParameters> <pl:initParameters>
<fr:x_form xmlns:fr="http://com/exlibris/digitool/common/forms/xmlbeans"> <fr:x_form xmlns:fr="http://com/exlibris/digitool/common/forms/xmlbeans">
<!-- see https://github.com/ExLibrisGroup/Rosetta.dps-sdk-projects/blob/master/4.1/dps-sdk-deposit/src/xsd/x_form.xsd --> <!-- see https://github.com/ExLibrisGroup/Rosetta.dps-sdk-projects/blob/master/4.1/dps-sdk-deposit/src/xsd/x_form.xsd -->
......
...@@ -15,14 +15,14 @@ import java.util.stream.Stream; ...@@ -15,14 +15,14 @@ import java.util.stream.Stream;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/** /**
* Tests for {@link SLUBXmlFormatValidationPlugin}. * Tests for {@link XmlFormatValidationPlugin}.
* *
* @author andreas.romeyke@slub-dresden.de (Andreas Romeyke) * @author andreas.romeyke@slub-dresden.de (Andreas Romeyke)
*/ */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class TestSLUBXmlFormatValidationPlugin { public class TestXmlFormatValidationPlugin {
private static SLUBXmlFormatValidationPlugin mock; private static XmlFormatValidationPlugin mock;
private Path[] testPaths; private Path[] testPaths;
private final Map<String, String> initp = new HashMap<>(); private final Map<String, String> initp = new HashMap<>();
...@@ -36,7 +36,7 @@ public class TestSLUBXmlFormatValidationPlugin { ...@@ -36,7 +36,7 @@ public class TestSLUBXmlFormatValidationPlugin {
} catch (IOException e) { } catch (IOException e) {
// do nothing, because nothing found // do nothing, because nothing found
} }
mock = new SLUBXmlFormatValidationPlugin(); mock = new XmlFormatValidationPlugin();
initp.put("catalog", "example_catalog/catalog"); initp.put("catalog", "example_catalog/catalog");
initp.put("schemacatalog", "example_catalog/schema_catalog.xml"); initp.put("schemacatalog", "example_catalog/schema_catalog.xml");
initp.put("debug", "true"); initp.put("debug", "true");
......
...@@ -4,7 +4,7 @@ import org.junit.Before; ...@@ -4,7 +4,7 @@ import org.junit.Before;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.slub.rosetta.dps.repository.plugin.XmlErrorHandler; import org.slub.rosetta.dps.repository.plugin.XmlErrorHandler;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin; import org.slub.rosetta.dps.repository.plugin.XmlFormatValidationPlugin;
import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle; import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.w3c.dom.Document; import org.w3c.dom.Document;
...@@ -24,7 +24,7 @@ import static org.junit.Assert.*; ...@@ -24,7 +24,7 @@ import static org.junit.Assert.*;
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class TestSLUBValidateRelaxNG { public class TestSLUBValidateRelaxNG {
private static SLUBXmlFormatValidationPlugin mock; private static XmlFormatValidationPlugin mock;
private final Map<String, String> initp = new HashMap<>(); private final Map<String, String> initp = new HashMap<>();
private URI local2Uri(String sUri) { private URI local2Uri(String sUri) {
...@@ -41,7 +41,7 @@ public class TestSLUBValidateRelaxNG { ...@@ -41,7 +41,7 @@ public class TestSLUBValidateRelaxNG {
} }
@Before @Before
public void setUp() { public void setUp() {
mock = new SLUBXmlFormatValidationPlugin(); mock = new XmlFormatValidationPlugin();
initp.put("catalog", "/etc/xml/catalog"); initp.put("catalog", "/etc/xml/catalog");
initp.put("schemacatalog", "example_catalog/schema_catalog.xml"); initp.put("schemacatalog", "example_catalog/schema_catalog.xml");
initp.put("debug", "true"); initp.put("debug", "true");
......
...@@ -3,7 +3,7 @@ package org.slub.rosetta.dps.repository.plugin.Validation; ...@@ -3,7 +3,7 @@ package org.slub.rosetta.dps.repository.plugin.Validation;
import org.junit.Before; import org.junit.Before;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.slub.rosetta.dps.repository.plugin.SLUBXmlFormatValidationPlugin; import org.slub.rosetta.dps.repository.plugin.XmlFormatValidationPlugin;
import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle; import org.slub.rosetta.dps.repository.plugin.ValidationResultHandle;
import org.slub.rosetta.dps.repository.plugin.ValidationResourceResolver; import org.slub.rosetta.dps.repository.plugin.ValidationResourceResolver;
import org.slub.rosetta.dps.repository.plugin.ValidationSchema; import org.slub.rosetta.dps.repository.plugin.ValidationSchema;
...@@ -26,7 +26,7 @@ import static org.junit.Assert.*; ...@@ -26,7 +26,7 @@ import static org.junit.Assert.*;
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class TestSLUBValidateSchema { public class TestSLUBValidateSchema {
private static SLUBXmlFormatValidationPlugin mock; private static XmlFormatValidationPlugin mock;
private final Map<String, String> initp = new HashMap<>(); private final Map<String, String> initp = new HashMap<>();
private URI local2Uri(String sUri) { private URI local2Uri(String sUri) {
...@@ -43,7 +43,7 @@ public class TestSLUBValidateSchema { ...@@ -43,7 +43,7 @@ public class TestSLUBValidateSchema {
} }
@Before @Before
public void setUp() { public void setUp() {
mock = new SLUBXmlFormatValidationPlugin(); mock = new XmlFormatValidationPlugin();
initp.put("catalog", "/etc/xml/catalog"); initp.put("catalog", "/etc/xml/catalog");
initp.put("schemacatalog", "example_catalog/schema_catalog.xml"); initp.put("schemacatalog", "example_catalog/schema_catalog.xml");
initp.put("debug", "true"); initp.put("debug", "true");
......
...@@ -49,8 +49,8 @@ import java.util.Set; ...@@ -49,8 +49,8 @@ import java.util.Set;
* @author andreas.romeyke@slub-dresden.de (Andreas Romeyke) * @author andreas.romeyke@slub-dresden.de (Andreas Romeyke)
* @see com.exlibris.dps.sdk.techmd.FormatValidationPlugin * @see com.exlibris.dps.sdk.techmd.FormatValidationPlugin
*/ */
public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin { public class XmlFormatValidationPlugin implements FormatValidationPlugin {
private static final ExLogger log = ExLogger.getExLogger(SLUBXmlFormatValidationPlugin.class); private static final ExLogger log = ExLogger.getExLogger(XmlFormatValidationPlugin.class);
private ValidationResultHandle validationLogger; private ValidationResultHandle validationLogger;
private boolean debug; private boolean debug;
private boolean valid; private boolean valid;
...@@ -77,7 +77,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin { ...@@ -77,7 +77,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
for (int i = 0; i <nodesCount ; i++) { for (int i = 0; i <nodesCount ; i++) {
Node node = nodes.item(i); Node node = nodes.item(i);
List<String> attr_list = getAttrList(node, attr_strings); List<String> attr_list = getAttrList(node, attr_strings);
boolean allValid = attr_list.stream().allMatch(SLUBXmlFormatValidationPlugin::checkAttributesOfNamespaceSchemaMapFile); boolean allValid = attr_list.stream().allMatch(XmlFormatValidationPlugin::checkAttributesOfNamespaceSchemaMapFile);
if (allValid) { if (allValid) {
String attr_type = attr_list.get(0); String attr_type = attr_list.get(0);
String namespace = attr_list.get(1); String namespace = attr_list.get(1);
...@@ -137,7 +137,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin { ...@@ -137,7 +137,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
return null != attr_type && !attr_type.isBlank(); return null != attr_type && !attr_type.isBlank();
} }
public SLUBXmlFormatValidationPlugin() { public XmlFormatValidationPlugin() {
dbf.setNamespaceAware(true); dbf.setNamespaceAware(true);
dbf.setValidating(false); dbf.setValidating(false);
dbf.setExpandEntityReferences(false); dbf.setExpandEntityReferences(false);
...@@ -362,7 +362,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin { ...@@ -362,7 +362,7 @@ public class SLUBXmlFormatValidationPlugin implements FormatValidationPlugin {
* @param args list of files which should be scanned * @param args list of files which should be scanned
*/ */
public static void main(String[] args) { public static void main(String[] args) {
var plugin = new SLUBXmlFormatValidationPlugin(); var plugin = new XmlFormatValidationPlugin();
Map<String, String> initp = new HashMap<>(); Map<String, String> initp = new HashMap<>();
initp.put("catalog", "/etc/xml/catalog"); initp.put("catalog", "/etc/xml/catalog");
initp.put("schemacatalog", "example_catalog/schema_catalog.xml"); initp.put("schemacatalog", "example_catalog/schema_catalog.xml");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment