Compare commits
18 Commits
62a174521d
...
Add_xslt_p
| Author | SHA1 | Date | |
|---|---|---|---|
| 75db025d80 | |||
| d33ac7e9f8 | |||
| bbae61da42 | |||
| 1d5038ca51 | |||
| bdb807d3e0 | |||
| 16b5522ff5 | |||
| 04e37258bf | |||
| b7af1eb33a | |||
| ec49f496da | |||
| 9cb949b485 | |||
| 097af3ed3a | |||
| b9f26f07a8 | |||
| 6a70c3c9c9 | |||
| a0d759f58b | |||
| 9f64b83844 | |||
| 0d469db020 | |||
| 38b3942bde | |||
| e834229cae |
@@ -84,8 +84,14 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xalan</groupId>
|
<groupId>xalan</groupId>
|
||||||
<artifactId>xalan</artifactId>
|
<artifactId>xalan</artifactId>
|
||||||
<version>2.7.2</version>
|
<version>2.7.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>xerces</groupId>
|
||||||
|
<artifactId>xercesImpl</artifactId>
|
||||||
|
<version>2.12.2</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- Logging -->
|
<!-- Logging -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class MultipleXMLController implements RestController {
|
|||||||
private XMLResponseBody processData(MultipleXmlJob xmlJob) throws Exception {
|
private XMLResponseBody processData(MultipleXmlJob xmlJob) throws Exception {
|
||||||
XmlEngine engine = xmlJob.getEngine();
|
XmlEngine engine = xmlJob.getEngine();
|
||||||
XMLMultipleFilesBody requestBody = xmlJob.getRequestBody();
|
XMLMultipleFilesBody requestBody = xmlJob.getRequestBody();
|
||||||
String result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
|
String result = engine.processXSLT(requestBody.getParams(), requestBody.getData(), requestBody.getProcessorData());
|
||||||
return new XMLResponseBody(result, "OK", requestBody.getVersion());
|
return new XMLResponseBody(result, "OK", requestBody.getVersion());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,26 @@
|
|||||||
package com.r11.tools.controller;
|
package com.r11.tools.controller;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.r11.tools.controller.internal.*;
|
import com.r11.tools.controller.internal.GlobalControllerManifest;
|
||||||
|
import com.r11.tools.controller.internal.HandlerType;
|
||||||
|
import com.r11.tools.controller.internal.RestController;
|
||||||
|
import com.r11.tools.controller.internal.ScopedControllerManifest;
|
||||||
|
import com.r11.tools.controller.internal.XmlJob;
|
||||||
|
import com.r11.tools.controller.internal.XmlJobType;
|
||||||
import com.r11.tools.model.XMLRequestBody;
|
import com.r11.tools.model.XMLRequestBody;
|
||||||
import com.r11.tools.model.XMLResponseBody;
|
import com.r11.tools.model.XMLResponseBody;
|
||||||
import com.r11.tools.model.XPathQueryResult;
|
import com.r11.tools.model.XPathQueryResult;
|
||||||
|
import com.r11.tools.model.XmlTools;
|
||||||
import com.r11.tools.xml.XmlEngine;
|
import com.r11.tools.xml.XmlEngine;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import spark.Request;
|
import spark.Request;
|
||||||
import spark.Response;
|
import spark.Response;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Controller used to handle XML tools: XPath, XSD validation, XQuery and XSLT
|
* Controller used to handle XML tools: XPath, XSD validation, XQuery and XSLT
|
||||||
|
*
|
||||||
* @author Adam Bem
|
* @author Adam Bem
|
||||||
*/
|
*/
|
||||||
@GlobalControllerManifest
|
@GlobalControllerManifest
|
||||||
@@ -22,12 +31,15 @@ public class XmlController implements RestController {
|
|||||||
|
|
||||||
private final XmlEngine saxon;
|
private final XmlEngine saxon;
|
||||||
private final XmlEngine xalan;
|
private final XmlEngine xalan;
|
||||||
|
private final XmlTools tools;
|
||||||
|
|
||||||
public XmlController(Gson gson, Logger logger, XmlEngine saxon, XmlEngine xalan) {
|
public XmlController(Gson gson, Logger logger, XmlEngine saxon, XmlEngine xalan) {
|
||||||
this.gson = gson;
|
this.gson = gson;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.saxon = saxon;
|
this.saxon = saxon;
|
||||||
this.xalan = xalan;
|
this.xalan = xalan;
|
||||||
|
this.tools = new XmlTools();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
|
@ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
|
||||||
@@ -48,6 +60,7 @@ public class XmlController implements RestController {
|
|||||||
|
|
||||||
@ScopedControllerManifest(method = HandlerType.POST, path = "/xslt")
|
@ScopedControllerManifest(method = HandlerType.POST, path = "/xslt")
|
||||||
public void acceptRequestXslt(Request request, Response response) {
|
public void acceptRequestXslt(Request request, Response response) {
|
||||||
|
System.out.println("received xslt");
|
||||||
acceptRequest(request, response, XmlJobType.XSLT);
|
acceptRequest(request, response, XmlJobType.XSLT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,7 +104,6 @@ public class XmlController implements RestController {
|
|||||||
responseBody.setDuration(duration);
|
responseBody.setDuration(duration);
|
||||||
|
|
||||||
xmlJob.getResponse().status(200);
|
xmlJob.getResponse().status(200);
|
||||||
|
|
||||||
this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
|
this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
|
||||||
xmlJob.getEngine().getVersion() +
|
xmlJob.getEngine().getVersion() +
|
||||||
") processed in " + duration + " ms.");
|
") processed in " + duration + " ms.");
|
||||||
@@ -130,7 +142,7 @@ public class XmlController implements RestController {
|
|||||||
String result = null;
|
String result = null;
|
||||||
switch (xmlJob.getXmlJobType()) {
|
switch (xmlJob.getXmlJobType()) {
|
||||||
case XSLT:
|
case XSLT:
|
||||||
result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
|
result = engine.processXSLT(requestBody.getParams(),requestBody.getData(), requestBody.getProcessorData());
|
||||||
break;
|
break;
|
||||||
case XSD:
|
case XSD:
|
||||||
result = engine.validate(requestBody.getData(), requestBody.getProcessorData()).trim();
|
result = engine.validate(requestBody.getData(), requestBody.getProcessorData()).trim();
|
||||||
@@ -141,9 +153,10 @@ public class XmlController implements RestController {
|
|||||||
requestBody.getVersion());
|
requestBody.getVersion());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return new XMLResponseBody(result, "OK", requestBody.getVersion());
|
return new XMLResponseBody(result, "OK", requestBody.getProcessorData());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private XMLResponseBody processingErrorResponse(Exception ex, XmlJob xmlJob) {
|
private XMLResponseBody processingErrorResponse(Exception ex, XmlJob xmlJob) {
|
||||||
XmlEngine engine = xmlJob.getEngine();
|
XmlEngine engine = xmlJob.getEngine();
|
||||||
XmlJobType xmlJobType = xmlJob.getXmlJobType();
|
XmlJobType xmlJobType = xmlJob.getXmlJobType();
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import spark.Response;
|
|||||||
public class XmlJob {
|
public class XmlJob {
|
||||||
private final Response response;
|
private final Response response;
|
||||||
private final XMLRequestBody requestBody;
|
private final XMLRequestBody requestBody;
|
||||||
private final XmlEngine engine;
|
private XmlEngine engine;
|
||||||
private final XmlJobType xmlJobType;
|
private final XmlJobType xmlJobType;
|
||||||
|
|
||||||
public XmlJob(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
|
public XmlJob(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
|
||||||
@@ -16,7 +16,11 @@ public class XmlJob {
|
|||||||
this.engine = engine;
|
this.engine = engine;
|
||||||
this.xmlJobType = xmlJobType;
|
this.xmlJobType = xmlJobType;
|
||||||
}
|
}
|
||||||
|
public XmlJob(Response response, XMLRequestBody requestBody, XmlJobType xmlJobType) {
|
||||||
|
this.response = response;
|
||||||
|
this.requestBody = requestBody;
|
||||||
|
this.xmlJobType = xmlJobType;
|
||||||
|
}
|
||||||
public Response getResponse() {
|
public Response getResponse() {
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.r11.tools.controller.internal;
|
package com.r11.tools.controller.internal;
|
||||||
|
|
||||||
public enum XmlJobType {
|
public enum XmlJobType {
|
||||||
XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT");
|
XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT"), XSLT_PARAM("XSLT_PARAM");
|
||||||
|
|
||||||
XmlJobType(String type) {
|
XmlJobType(String type) {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.r11.tools.model;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
|
|
||||||
|
public class Param {
|
||||||
|
@SerializedName("key")
|
||||||
|
private String key;
|
||||||
|
@SerializedName("value")
|
||||||
|
private String value;
|
||||||
|
|
||||||
|
public String getKey() {
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -2,6 +2,8 @@ package com.r11.tools.model;
|
|||||||
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class XMLMultipleFilesBody {
|
public class XMLMultipleFilesBody {
|
||||||
|
|
||||||
@SerializedName("data")
|
@SerializedName("data")
|
||||||
@@ -12,6 +14,8 @@ public class XMLMultipleFilesBody {
|
|||||||
private String processor;
|
private String processor;
|
||||||
@SerializedName("version")
|
@SerializedName("version")
|
||||||
private String version;
|
private String version;
|
||||||
|
@SerializedName("params")
|
||||||
|
private List<Param> params;
|
||||||
|
|
||||||
|
|
||||||
public String getProcessorData() {
|
public String getProcessorData() {
|
||||||
@@ -29,4 +33,9 @@ public class XMLMultipleFilesBody {
|
|||||||
public XMLMultipleFilesData[] getData() {
|
public XMLMultipleFilesData[] getData() {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Param> getParams() {
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package com.r11.tools.model;
|
|||||||
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* POJO class used to contain body of XML related requests
|
* POJO class used to contain body of XML related requests
|
||||||
* @author Adam Bem
|
* @author Adam Bem
|
||||||
@@ -15,20 +17,22 @@ public class XMLRequestBody {
|
|||||||
private String processor;
|
private String processor;
|
||||||
@SerializedName("version")
|
@SerializedName("version")
|
||||||
private String version;
|
private String version;
|
||||||
|
@SerializedName("params")
|
||||||
|
private List<Param> params;
|
||||||
|
|
||||||
public String getData() {
|
public String getData() {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
public String getProcessorData() {return processorData;}
|
||||||
public String getProcessorData() {
|
|
||||||
return processorData;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getProcessor() {
|
public String getProcessor() {
|
||||||
return processor;
|
return processor;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getVersion() {
|
public String getVersion() {
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
public List<Param> getParams() {
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ public class XMLResponseBody {
|
|||||||
// Optional
|
// Optional
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
|
public XMLResponseBody(String status){
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
public XMLResponseBody(String result, String status, String processor) {
|
public XMLResponseBody(String result, String status, String processor) {
|
||||||
this.result = result;
|
this.result = result;
|
||||||
this.status = status;
|
this.status = status;
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package com.r11.tools.model;
|
||||||
|
|
||||||
|
import org.w3c.dom.Document;
|
||||||
|
import org.w3c.dom.Element;
|
||||||
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
|
import javax.xml.parsers.ParserConfigurationException;
|
||||||
|
import javax.xml.transform.Transformer;
|
||||||
|
import javax.xml.transform.TransformerException;
|
||||||
|
import javax.xml.transform.TransformerFactory;
|
||||||
|
import javax.xml.transform.dom.DOMSource;
|
||||||
|
import javax.xml.transform.stream.StreamResult;
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class XmlTools {
|
||||||
|
private final Map<String, String> createdParameters = new HashMap<>();
|
||||||
|
private void createNewNode(String paramName, String paramValue, Document doc) {
|
||||||
|
String parameter = "xsl:param";
|
||||||
|
Element param = doc.createElement(parameter);
|
||||||
|
String nameAttribute = "name";
|
||||||
|
param.setAttribute(nameAttribute, paramName);
|
||||||
|
String valueAttribute = "select";
|
||||||
|
param.setAttribute(valueAttribute, "'" + paramValue + "'");
|
||||||
|
doc.getDocumentElement().appendChild(param);
|
||||||
|
}
|
||||||
|
public String addParams(List<Param> params,String processorData) {
|
||||||
|
params.forEach(param ->
|
||||||
|
createdParameters.put(param.getKey(), param.getValue())
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
return docToString(addNode(processorData));
|
||||||
|
|
||||||
|
} catch (ParserConfigurationException | SAXException | IOException | TransformerException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}finally {
|
||||||
|
createdParameters.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private Document addNode(String processorData) throws ParserConfigurationException, SAXException, IOException {
|
||||||
|
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
|
||||||
|
InputStream stream = new ByteArrayInputStream(processorData.getBytes(StandardCharsets.UTF_8));
|
||||||
|
Document doc = builder.parse(stream);
|
||||||
|
createdParameters.forEach((paramName, paramValue) -> createNewNode(paramName, paramValue, doc));
|
||||||
|
return doc;
|
||||||
|
}
|
||||||
|
private String docToString(Document doc) throws TransformerException {
|
||||||
|
TransformerFactory transformerFactory = TransformerFactory.newInstance();
|
||||||
|
Transformer transformer = transformerFactory.newTransformer();
|
||||||
|
DOMSource source = new DOMSource(doc);
|
||||||
|
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||||
|
StreamResult result = new StreamResult(outputStream);
|
||||||
|
transformer.transform(source, result);
|
||||||
|
return outputStream.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
package com.r11.tools.xml;
|
package com.r11.tools.xml;
|
||||||
|
|
||||||
|
import com.r11.tools.model.Param;
|
||||||
import com.r11.tools.model.XMLMultipleFilesData;
|
import com.r11.tools.model.XMLMultipleFilesData;
|
||||||
|
import com.r11.tools.model.XMLRequestBody;
|
||||||
import com.r11.tools.model.XPathQueryResult;
|
import com.r11.tools.model.XPathQueryResult;
|
||||||
|
import com.r11.tools.model.XmlTools;
|
||||||
import net.sf.saxon.s9api.*;
|
import net.sf.saxon.s9api.*;
|
||||||
|
|
||||||
import javax.xml.transform.stream.StreamSource;
|
import javax.xml.transform.stream.StreamSource;
|
||||||
@@ -10,6 +13,7 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,10 +30,13 @@ public class Saxon implements XmlEngine{
|
|||||||
* @throws SaxonApiException thrown on stylesheet or transformation error
|
* @throws SaxonApiException thrown on stylesheet or transformation error
|
||||||
* @throws IOException thrown when file does not exist, or cannot be read.
|
* @throws IOException thrown when file does not exist, or cannot be read.
|
||||||
*/
|
*/
|
||||||
public String processXSLT(XMLMultipleFilesData[] data, String transform) throws SaxonApiException, IOException{
|
XmlTools tools = new XmlTools();
|
||||||
|
public String processXSLT(List<Param> params, XMLMultipleFilesData[] data, String transform) throws SaxonApiException, IOException{
|
||||||
Processor processor = new Processor(false);
|
Processor processor = new Processor(false);
|
||||||
XsltCompiler compiler = processor.newXsltCompiler();
|
XsltCompiler compiler = processor.newXsltCompiler();
|
||||||
|
|
||||||
|
transform = tools.addParams(params,transform);
|
||||||
|
|
||||||
String filesPath = "/tmp/"+UUID.randomUUID()+"/";
|
String filesPath = "/tmp/"+UUID.randomUUID()+"/";
|
||||||
try{
|
try{
|
||||||
createXMLFilesFromData(data, filesPath);
|
createXMLFilesFromData(data, filesPath);
|
||||||
@@ -78,14 +85,18 @@ public class Saxon implements XmlEngine{
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Transforms string containing xml document via xslt
|
* Transforms string containing xml document via xslt
|
||||||
|
*
|
||||||
|
* @param params
|
||||||
* @param data xml to be transformed
|
* @param data xml to be transformed
|
||||||
* @param transform xslt
|
* @param transform xslt
|
||||||
* @return transformed xml
|
* @return transformed xml
|
||||||
* @throws SaxonApiException thrown on stylesheet or transformation errors
|
* @throws SaxonApiException thrown on stylesheet or transformation errors
|
||||||
*/
|
*/
|
||||||
public String processXSLT(String data, String transform) throws SaxonApiException {
|
public String processXSLT(List<Param> params, String data, String transform) throws SaxonApiException {
|
||||||
Processor processor = new Processor(false);
|
Processor processor = new Processor(false);
|
||||||
XsltCompiler compiler = processor.newXsltCompiler();
|
XsltCompiler compiler = processor.newXsltCompiler();
|
||||||
|
transform = tools.addParams(params,transform);
|
||||||
|
System.out.println(transform);
|
||||||
XsltExecutable stylesheet = compiler.compile(new StreamSource(new StringReader(transform)));
|
XsltExecutable stylesheet = compiler.compile(new StreamSource(new StringReader(transform)));
|
||||||
StringWriter sw = new StringWriter();
|
StringWriter sw = new StringWriter();
|
||||||
Serializer out = processor.newSerializer(sw);
|
Serializer out = processor.newSerializer(sw);
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
package com.r11.tools.xml;
|
package com.r11.tools.xml;
|
||||||
|
|
||||||
|
import com.r11.tools.model.Param;
|
||||||
import com.r11.tools.model.XMLMultipleFilesData;
|
import com.r11.tools.model.XMLMultipleFilesData;
|
||||||
|
import com.r11.tools.model.XMLRequestBody;
|
||||||
import com.r11.tools.model.XPathQueryResult;
|
import com.r11.tools.model.XPathQueryResult;
|
||||||
|
import com.r11.tools.model.XmlTools;
|
||||||
import org.apache.xpath.XPathAPI;
|
import org.apache.xpath.XPathAPI;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
@@ -22,6 +25,7 @@ import java.io.ByteArrayOutputStream;
|
|||||||
import java.io.OutputStreamWriter;
|
import java.io.OutputStreamWriter;
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handler for Xalan engine
|
* Handler for Xalan engine
|
||||||
@@ -31,16 +35,20 @@ public class Xalan implements XmlEngine{
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Transforms string containing xml document via xslt
|
* Transforms string containing xml document via xslt
|
||||||
|
*
|
||||||
|
* @param params
|
||||||
* @param data xml to be transformed
|
* @param data xml to be transformed
|
||||||
* @param transform xslt
|
* @param transform xslt
|
||||||
* @return transformed xml
|
* @return transformed xml
|
||||||
* @throws Exception thrown on stylesheet or transformation errors
|
* @throws Exception thrown on stylesheet or transformation errors
|
||||||
*/
|
*/
|
||||||
public String processXSLT(String data, String transform) throws Exception {
|
public String processXSLT(List<Param> params, String data, String transform) throws Exception {
|
||||||
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
|
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
|
||||||
DocumentBuilder builder = factory.newDocumentBuilder();
|
DocumentBuilder builder = factory.newDocumentBuilder();
|
||||||
Document document = builder.parse(new InputSource(new StringReader(data)));
|
Document document = builder.parse(new InputSource(new StringReader(data)));
|
||||||
|
|
||||||
|
XmlTools tools = new XmlTools();
|
||||||
|
transform = tools.addParams(params,transform);
|
||||||
StreamSource stylesource = new StreamSource(new StringReader(transform));
|
StreamSource stylesource = new StreamSource(new StringReader(transform));
|
||||||
Transformer transformer = TransformerFactory.newInstance().newTransformer(stylesource);
|
Transformer transformer = TransformerFactory.newInstance().newTransformer(stylesource);
|
||||||
transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
|
transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
|
||||||
@@ -62,7 +70,7 @@ public class Xalan implements XmlEngine{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String processXSLT(XMLMultipleFilesData[] data, String transform) throws Exception {
|
public String processXSLT(List<Param> params, XMLMultipleFilesData[] data, String transform) throws Exception {
|
||||||
throw new UnsupportedOperationException("Xalan does not support multiple files XSLT processing");
|
throw new UnsupportedOperationException("Xalan does not support multiple files XSLT processing");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
package com.r11.tools.xml;
|
package com.r11.tools.xml;
|
||||||
|
|
||||||
|
import com.r11.tools.model.Param;
|
||||||
import com.r11.tools.model.XMLMultipleFilesData;
|
import com.r11.tools.model.XMLMultipleFilesData;
|
||||||
import com.r11.tools.model.XPathQueryResult;
|
import com.r11.tools.model.XPathQueryResult;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public interface XmlEngine {
|
public interface XmlEngine {
|
||||||
|
|
||||||
String processXSLT(XMLMultipleFilesData[] data, String transform) throws Exception;
|
String processXSLT(List<Param> params, XMLMultipleFilesData[] data, String transform) throws Exception;
|
||||||
XPathQueryResult processXPath(String data, String query, String version) throws Exception;
|
XPathQueryResult processXPath(String data, String query, String version) throws Exception;
|
||||||
String processXSLT(String data, String transform) throws Exception;
|
String processXSLT(List<Param> params, String data, String transform) throws Exception;
|
||||||
String validate(String data, String xsd) throws Exception;
|
String validate(String data, String xsd) throws Exception;
|
||||||
|
|
||||||
String executeXQuery(String data, String xquery, String version) throws Exception;
|
String executeXQuery(String data, String xquery, String version) throws Exception;
|
||||||
|
|
||||||
public String getVersion();
|
public String getVersion();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
72
Frontend/src/components/XsltParamComponent.vue
Normal file
72
Frontend/src/components/XsltParamComponent.vue
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {ref} from 'vue'
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update-value', options: { name: string }[]): void;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const options = ref<{ name: string }[]>([
|
||||||
|
{ name: "Add Param" }
|
||||||
|
]);
|
||||||
|
|
||||||
|
const sendToParent = () => {
|
||||||
|
options.value.forEach((value) => {console.log("KID" + value + options.value.indexOf(value))})
|
||||||
|
emit('update-value', options.value);
|
||||||
|
};
|
||||||
|
const nameInput = ref('')
|
||||||
|
const valueInput = ref('')
|
||||||
|
const selectedOption = ref(options.value[0].name)
|
||||||
|
|
||||||
|
const isNumeric = (string : string) => /^[+-]?\d+(\.\d+)?$/.test(string)
|
||||||
|
|
||||||
|
const selectedFunction = () => {
|
||||||
|
const action = selectOption(selectedOption.value);
|
||||||
|
const name = nameInput.value.trim();
|
||||||
|
const value = valueInput.value.trim();
|
||||||
|
|
||||||
|
if (action === "Add Param" && name && value && !isNumeric(name)) {
|
||||||
|
options.value.push({ name: `${name} = ${value}` });
|
||||||
|
nameInput.value = valueInput.value = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action === "Remove Param") {
|
||||||
|
options.value = options.value.filter(option => option.name !== selectedOption.value);
|
||||||
|
selectedOption.value = options.value.length ? options.value[0].name : "";
|
||||||
|
nameInput.value = valueInput.value = "";
|
||||||
|
}
|
||||||
|
sendToParent();
|
||||||
|
};
|
||||||
|
function selectOption(option: string): string {
|
||||||
|
return option == "Add Param" ? "Add Param" : "Remove Param"
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<input
|
||||||
|
v-if="selectedOption==='Add Param'"
|
||||||
|
id="NameTextInput"
|
||||||
|
v-model="nameInput"
|
||||||
|
class="text-input h-full px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-48"
|
||||||
|
type="text"
|
||||||
|
placeholder="Name"
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
v-if="selectedOption==='Add Param'"
|
||||||
|
id="ValueTextInput"
|
||||||
|
v-model="valueInput"
|
||||||
|
class="text-input h-full px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-48"
|
||||||
|
type="text"
|
||||||
|
placeholder="Value"
|
||||||
|
/>
|
||||||
|
<select
|
||||||
|
v-model="selectedOption"
|
||||||
|
class="flex h-full px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-48"
|
||||||
|
>
|
||||||
|
<option v-for="option in options" :value="option.name" :key="option.name">
|
||||||
|
{{ option.name }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<button class="tool-button w-24" @click="selectedFunction">{{ selectOption(selectedOption) }}</button>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
|
||||||
@@ -2,24 +2,31 @@
|
|||||||
import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
|
import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
|
||||||
import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
|
import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
|
||||||
import CodeEditor from '@/components/common/CodeEditorComponent.vue'
|
import CodeEditor from '@/components/common/CodeEditorComponent.vue'
|
||||||
|
import XsltParamComponent from '@/components/XsltParamComponent.vue'
|
||||||
|
|
||||||
import {ref} from 'vue'
|
import {ref} from 'vue'
|
||||||
|
|
||||||
const props = defineProps(
|
const props = defineProps<{
|
||||||
{
|
stylizedName: string;
|
||||||
stylizedName: {type: String, required: true},
|
data?: string;
|
||||||
data: {type: String},
|
params?: { name: string }[];
|
||||||
}
|
}>();
|
||||||
)
|
|
||||||
const emit = defineEmits(['update:modelValue'])
|
const emit = defineEmits(['update:modelValue','update:params'])
|
||||||
|
|
||||||
const data = ref('')
|
const data = ref('')
|
||||||
const inputFile = ref()
|
const inputFile = ref()
|
||||||
|
const params = ref<{ name: string }[]>([]);
|
||||||
|
|
||||||
function sendValue() {
|
function sendValue() {
|
||||||
emit('update:modelValue', data.value)
|
emit('update:modelValue', data.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateParams(newParams: { name: string }[]) {
|
||||||
|
emit('update:params', newParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function updateData(newData: string, clearFileSelector: boolean = true) {
|
function updateData(newData: string, clearFileSelector: boolean = true) {
|
||||||
data.value = newData
|
data.value = newData
|
||||||
if (clearFileSelector)
|
if (clearFileSelector)
|
||||||
@@ -37,34 +44,53 @@ function canBeFormatted() {
|
|||||||
props.stylizedName.toLowerCase() == 'xslt'
|
props.stylizedName.toLowerCase() == 'xslt'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addParameters() {
|
||||||
|
return props.stylizedName?.toLowerCase() == "xslt"
|
||||||
|
}
|
||||||
|
|
||||||
function readFile(file: any) {
|
function readFile(file: any) {
|
||||||
|
|
||||||
const reader = new FileReader()
|
const reader = new FileReader()
|
||||||
reader.onloadend = () => {
|
reader.onloadend = () => {
|
||||||
let result = reader.result?.toString()
|
let result = reader.result?.toString()
|
||||||
if (typeof result == "string")
|
if (typeof result == "string")
|
||||||
updateData(result, false);
|
updateData(result, false)
|
||||||
|
|
||||||
}
|
}
|
||||||
reader.readAsText(file.target.files[0])
|
reader.readAsText(file.target.files[0])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleUpdateValue = (options: { name: string }[]) => {
|
||||||
|
console.log("from parent" +options.length)
|
||||||
|
params.value = options
|
||||||
|
updateParams(params.value)
|
||||||
|
};
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
|
<div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
|
||||||
|
<div class="flex justify-between mb-2"></div>
|
||||||
|
|
||||||
<div class="flex place-content-between w-full items-center">
|
<div class="flex place-content-between w-full items-center">
|
||||||
|
|
||||||
<span class="dark:text-white mr-2">{{ stylizedName }}</span>
|
<span class="dark:text-white mr-2">{{ stylizedName }}</span>
|
||||||
<div class="flex space-x-2 pb-2 overflow-x-auto">
|
|
||||||
<div class="flex items-stretch w-64">
|
<div class="flex items-stretch w-64">
|
||||||
<input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile"/>
|
<input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="flex space-x-2 pb-2 overflow-x-auto">
|
||||||
<InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
|
<InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
|
||||||
<XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
|
<XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
|
||||||
<button class="tool-button" @click="clear">Clear</button>
|
<button class="tool-button" @click="clear">Clear</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-end gap-2 place-content-between w-full items-center">
|
||||||
|
<XsltParamComponent v-if="addParameters()" @update-value="handleUpdateValue" :xslt="data"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
|
<CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -3,19 +3,20 @@ import { onMounted, ref } from 'vue';
|
|||||||
import {type TabData} from '../common/TabData'
|
import {type TabData} from '../common/TabData'
|
||||||
import CodeEditor from '@/components/common/CodeEditorComponent.vue';
|
import CodeEditor from '@/components/common/CodeEditorComponent.vue';
|
||||||
|
|
||||||
const props = defineProps(
|
const props = defineProps<{
|
||||||
{
|
tool: string;
|
||||||
tool: {type: String, required: true},
|
xml: string | TabData[];
|
||||||
xml: {type: [String, Array<TabData>], required: true},
|
query: string;
|
||||||
query: {type: String, required: true}
|
params?: { name: string }[];
|
||||||
}
|
}>();
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits(["update"]);
|
const emit = defineEmits(["update"]);
|
||||||
|
|
||||||
const result = ref('');
|
const result = ref('');
|
||||||
|
|
||||||
let enginesForCurrentTool = ref(["saxon", "xalan", "libxml"]);
|
let enginesForCurrentTool = ref(["saxon", "xalan", "libxml"]);
|
||||||
|
const formattedParams = ref();
|
||||||
|
|
||||||
|
|
||||||
const allVersions = ["1.0", "2.0", "3.0", "3.1"];
|
const allVersions = ["1.0", "2.0", "3.0", "3.1"];
|
||||||
let versionsForCurrentEngine = ref([""]);
|
let versionsForCurrentEngine = ref([""]);
|
||||||
@@ -86,6 +87,8 @@ function selectDefaultVersion() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function process() {
|
function process() {
|
||||||
|
props.params?.forEach((param) => {console.log(param.name)})
|
||||||
|
|
||||||
let request:Request = prepareRequest();
|
let request:Request = prepareRequest();
|
||||||
fetchRequest(request).then((data) => {
|
fetchRequest(request).then((data) => {
|
||||||
updateOutputField(data);
|
updateOutputField(data);
|
||||||
@@ -99,6 +102,7 @@ function updateOutputField(data: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function prepareRequest():Request {
|
function prepareRequest():Request {
|
||||||
|
formattedParams.value = formatParams()
|
||||||
let request = new Request(prepareURL(), {
|
let request = new Request(prepareURL(), {
|
||||||
body: selectRequestBodyType(),
|
body: selectRequestBodyType(),
|
||||||
method: "POST"
|
method: "POST"
|
||||||
@@ -125,24 +129,35 @@ function selectRequestBodyType() : string {
|
|||||||
else
|
else
|
||||||
return prepareRequestBodySingleXml(props.xml!);
|
return prepareRequestBodySingleXml(props.xml!);
|
||||||
}
|
}
|
||||||
|
function formatParams() {
|
||||||
|
return props.params?.slice(1).map(param => {
|
||||||
|
const [key, value] = param.name.split(" = ");
|
||||||
|
return { key, value };
|
||||||
|
}) ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
function prepareRequestBodySingleXml(data: string):string {
|
function prepareRequestBodySingleXml(data: string):string {
|
||||||
|
|
||||||
let requestBody = JSON.stringify({
|
let requestBody = JSON.stringify({
|
||||||
|
"params": formattedParams.value,
|
||||||
"data": data,
|
"data": data,
|
||||||
"processorData": props.query,
|
"processorData": props.query,
|
||||||
"processor": engine.value,
|
"processor": engine.value,
|
||||||
"version": version.value
|
"version": version.value
|
||||||
});
|
});
|
||||||
|
console.log(requestBody);
|
||||||
return requestBody;
|
return requestBody;
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareRequestBodyMultiXml():string {
|
function prepareRequestBodyMultiXml():string {
|
||||||
|
|
||||||
if (!Array.isArray(props.xml))
|
if (!Array.isArray(props.xml))
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
let xmlFilesArray = convertDataArray(props.xml);
|
let xmlFilesArray = convertDataArray(props.xml);
|
||||||
|
|
||||||
let requestBody = JSON.stringify({
|
let requestBody = JSON.stringify({
|
||||||
|
"params": formattedParams.value,
|
||||||
"data": xmlFilesArray,
|
"data": xmlFilesArray,
|
||||||
"processorData": props.query,
|
"processorData": props.query,
|
||||||
"processor": engine.value,
|
"processor": engine.value,
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { ref } from 'vue';
|
|||||||
const xml = ref(new Array<TabData>);
|
const xml = ref(new Array<TabData>);
|
||||||
const query = ref('');
|
const query = ref('');
|
||||||
const version = ref('');
|
const version = ref('');
|
||||||
|
const params = ref<{ name: string }[]>([]);
|
||||||
|
|
||||||
function updateVersion(newVersion: string) {
|
function updateVersion(newVersion: string) {
|
||||||
version.value = newVersion;
|
version.value = newVersion;
|
||||||
@@ -23,9 +24,9 @@ function updateVersion(newVersion: string) {
|
|||||||
<div class="flex flex-col 2xl:flex-row w-full xl:w-7/12 grow overflow-hide pr-2">
|
<div class="flex flex-col 2xl:flex-row w-full xl:w-7/12 grow overflow-hide pr-2">
|
||||||
<div class="flex flex-col w-full 2xl:w-1/2 h-2/3 2xl:h-full flex-none items-center">
|
<div class="flex flex-col w-full 2xl:w-1/2 h-2/3 2xl:h-full flex-none items-center">
|
||||||
<xmlTabbedInputComponent stylized-name="XML" :tab-count-limit="3" v-model="xml"></xmlTabbedInputComponent>
|
<xmlTabbedInputComponent stylized-name="XML" :tab-count-limit="3" v-model="xml"></xmlTabbedInputComponent>
|
||||||
<xmlInputFieldComponent stylized-name="XSLT" :data="query" v-model="query"></xmlInputFieldComponent>
|
<xmlInputFieldComponent stylized-name="XSLT" :data="query" v-model:params="params" v-model="query"></xmlInputFieldComponent>
|
||||||
</div>
|
</div>
|
||||||
<xmlOutputFieldComponent tool="xslt" :xml="xml" :query="query" @update="updateVersion"></xmlOutputFieldComponent>
|
<xmlOutputFieldComponent tool="xslt" :xml="xml" :query="query" :params="params" @update="updateVersion"></xmlOutputFieldComponent>
|
||||||
</div>
|
</div>
|
||||||
<TooltipComponent tool-type="xslt" :version="version"></TooltipComponent>
|
<TooltipComponent tool-type="xslt" :version="version"></TooltipComponent>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user