Skip to content

[3.9] Simplify Import XSL and allow usage of external files #6738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BartChris wants to merge 1 commit into
base: 3.9.x
Choose a base branch
from
Open

[3.9] Simplify Import XSL and allow usage of external files #6738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions ...o-XML-SchemaConverter/src/main/java/org/kitodo/xmlschemaconverter/XMLSchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,17 @@

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InvalidClassException;
import java.io.StringReader;
import java.io.StringWriter;
import java.nio.file.Files;
import java.util.List;
import java.util.Objects;
import java.util.UnknownFormatConversionException;

import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Result;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;

Expand All @@ -44,7 +35,6 @@
import org.kitodo.api.schemaconverter.MetadataFormat;
import org.kitodo.api.schemaconverter.SchemaConverterInterface;
import org.kitodo.exceptions.ConfigException;
import org.xml.sax.InputSource;

public class XMLSchemaConverter implements SchemaConverterInterface {
private static final FileFormat supportedSourceFileFormat = FileFormat.XML;
Expand Down Expand Up @@ -74,9 +64,7 @@ public DataRecord convert(DataRecord record, MetadataFormat targetMetadataFormat
throw new ConfigException("No mapping files found!");
} else {
for (File mappingFile : mappingFiles) {
try (InputStream fileStream = Files.newInputStream(mappingFile.toPath())) {
xmlString = transformXmlByXslt(xmlString, fileStream);
}
xmlString = transformXmlByXslt(xmlString, mappingFile);
}
}
conversionResult = xmlString;
Expand All @@ -102,29 +90,19 @@ public boolean supportsSourceFileFormat(FileFormat format) {
return supportedSourceFileFormat.equals(format);
}

private String transformXmlByXslt(String xmlString, InputStream stylesheetFile) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
try {
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
} catch (ParserConfigurationException e) {
throw new IllegalArgumentException(e.getMessage(), e);
}
factory.setNamespaceAware(true);
try {
StringWriter stringWriter = new StringWriter();
private String transformXmlByXslt(String xmlString, File stylesheetFile) {
try (StringWriter writer = new StringWriter()) {
StreamSource xsltSource = new StreamSource(stylesheetFile);
xsltSource.setSystemId(stylesheetFile.toURI().toString());
TransformerFactory transformerFactory = new TransformerFactoryImpl();
transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
transformerFactory.setURIResolver((href, base) -> new StreamSource(href.replace("http:", "https:")));
System.setProperty("http.agent", "Chrome");
Transformer xsltTransformer = transformerFactory.newTransformer(new StreamSource(stylesheetFile));
TransformerHandler handler
= ((SAXTransformerFactory) SAXTransformerFactory.newInstance()).newTransformerHandler();
handler.setResult(new StreamResult(stringWriter));
Result saxResult = new SAXResult(handler);
Transformer transformer = transformerFactory.newTransformer(xsltSource);
xmlString = removeBom(xmlString);
SAXSource saxSource = new SAXSource(new InputSource(new StringReader(xmlString)));
xsltTransformer.transform(saxSource, saxResult);
return stringWriter.toString();
} catch (TransformerException e) {
transformer.transform(new StreamSource(new StringReader(xmlString)), new StreamResult(writer));
return writer.toString();
} catch (TransformerException | IOException e) {
throw new ConfigException("Error in transforming the response to internal format: " + e.getMessage(), e);
}
}
Expand Down