9 Commits

15 changed files with 253 additions and 162 deletions

View File

@@ -84,8 +84,14 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
<version>2.7.3</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
<!-- Logging -->
<dependency>

View File

@@ -68,7 +68,7 @@ public class MultipleXMLController implements RestController {
private XMLResponseBody processData(MultipleXmlJob xmlJob) throws Exception {
XmlEngine engine = xmlJob.getEngine();
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());
}

View File

@@ -1,19 +1,26 @@
package com.r11.tools.controller;
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.XMLResponseBody;
import com.r11.tools.model.XPathQueryResult;
import com.r11.tools.model.XmlTools;
import com.r11.tools.xml.XmlEngine;
import org.apache.logging.log4j.Logger;
import spark.Request;
import spark.Response;
import java.io.StringWriter;
import java.util.Objects;
/**
* Controller used to handle XML tools: XPath, XSD validation, XQuery and XSLT
*
* @author Adam Bem
*/
@GlobalControllerManifest
@@ -24,12 +31,15 @@ public class XmlController implements RestController {
private final XmlEngine saxon;
private final XmlEngine xalan;
private final XmlTools tools;
public XmlController(Gson gson, Logger logger, XmlEngine saxon, XmlEngine xalan) {
this.gson = gson;
this.logger = logger;
this.saxon = saxon;
this.xalan = xalan;
this.tools = new XmlTools();
}
@ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
@@ -53,11 +63,7 @@ public class XmlController implements RestController {
System.out.println("received xslt");
acceptRequest(request, response, XmlJobType.XSLT);
}
@ScopedControllerManifest(method = HandlerType.POST, path = "/xslt/param")
public void acceptRequestXsltAddParam(Request request, Response response) {
System.out.println("received param");
acceptRequest(request, response, XmlJobType.XSLT_PARAM);
}
private void acceptRequest(Request request, Response response, XmlJobType xmlJobType) {
XMLRequestBody requestBody;
try {
@@ -67,12 +73,7 @@ public class XmlController implements RestController {
return;
}
if (requestBody.getProcessor() == null ) {
if(requestBody.getProcessorData() != null){
processRequest(new XmlJob(response, requestBody, xmlJobType));
return;
}
System.out.println("getProcessor=null");
if (requestBody.getProcessor() == null) {
invalidEngineSelectedResponse(response);
return;
}
@@ -103,9 +104,9 @@ public class XmlController implements RestController {
responseBody.setDuration(duration);
xmlJob.getResponse().status(200);
/* this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
xmlJob.getEngine().getVersion() +
") processed in " + duration + " ms.");*/
") processed in " + duration + " ms.");
} catch (Exception ex) {
responseBody = processingErrorResponse(ex, xmlJob);
@@ -140,15 +141,8 @@ public class XmlController implements RestController {
String result = null;
switch (xmlJob.getXmlJobType()) {
case XSLT_PARAM:
System.out.println("xstl_param");
System.out.println(requestBody.getProcessorData());
System.out.println(requestBody.getParamName());
System.out.println(requestBody.getParamValue());
result = addParam(requestBody.getProcessorData(), requestBody.getParamName(), requestBody.getParamValue());
break;
case XSLT:
result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
result = engine.processXSLT(requestBody.getParams(),requestBody.getData(), requestBody.getProcessorData());
break;
case XSD:
result = engine.validate(requestBody.getData(), requestBody.getProcessorData()).trim();
@@ -159,17 +153,9 @@ public class XmlController implements RestController {
requestBody.getVersion());
break;
}
System.out.println("can we get here?");
return new XMLResponseBody(result, "OK", requestBody.getProcessorData());
}
private String addParam(String processorData, String paramName, String paramValue) {
System.out.println("addParamSaxon");
processorData= processorData.replace("<xsl:template match=\"/\">", "<xsl:param name=\""+paramName+"\" select=\"'"+paramValue+"'\"/>\n\t\t<xsl:template match=\"/\">");
StringWriter sw = new StringWriter();
sw.write(processorData);
return sw.toString();
}
private XMLResponseBody processingErrorResponse(Exception ex, XmlJob xmlJob) {
XmlEngine engine = xmlJob.getEngine();

View File

@@ -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;
}
}

View File

@@ -2,6 +2,8 @@ package com.r11.tools.model;
import com.google.gson.annotations.SerializedName;
import java.util.List;
public class XMLMultipleFilesBody {
@SerializedName("data")
@@ -12,6 +14,8 @@ public class XMLMultipleFilesBody {
private String processor;
@SerializedName("version")
private String version;
@SerializedName("params")
private List<Param> params;
public String getProcessorData() {
@@ -29,4 +33,9 @@ public class XMLMultipleFilesBody {
public XMLMultipleFilesData[] getData() {
return data;
}
public List<Param> getParams() {
return params;
}
}

View File

@@ -2,6 +2,8 @@ package com.r11.tools.model;
import com.google.gson.annotations.SerializedName;
import java.util.List;
/**
* POJO class used to contain body of XML related requests
* @author Adam Bem
@@ -15,21 +17,22 @@ public class XMLRequestBody {
private String processor;
@SerializedName("version")
private String version;
@SerializedName("paramName")
private String paramName;
@SerializedName("paramValue")
private String paramValue;
@SerializedName("params")
private List<Param> params;
public String getData() {
return data;
}
public String getProcessorData() {return processorData;}
public String getParamName() {return paramName;}
public String getParamValue() {return paramValue;}
public String getProcessor() {
return processor;
}
public String getVersion() {
return version;
}
public List<Param> getParams() {
return params;
}
}

View File

@@ -10,6 +10,10 @@ public class XMLResponseBody {
// Optional
private String type;
public XMLResponseBody(String status){
this.status = status;
}
public XMLResponseBody(String result, String status, String processor) {
this.result = result;
this.status = status;

View File

@@ -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();
}
}

View File

@@ -1,7 +1,10 @@
package com.r11.tools.xml;
import com.r11.tools.model.Param;
import com.r11.tools.model.XMLMultipleFilesData;
import com.r11.tools.model.XMLRequestBody;
import com.r11.tools.model.XPathQueryResult;
import com.r11.tools.model.XmlTools;
import net.sf.saxon.s9api.*;
import javax.xml.transform.stream.StreamSource;
@@ -10,6 +13,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Comparator;
import java.util.List;
import java.util.UUID;
/**
@@ -26,10 +30,13 @@ public class Saxon implements XmlEngine{
* @throws SaxonApiException thrown on stylesheet or transformation error
* @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);
XsltCompiler compiler = processor.newXsltCompiler();
transform = tools.addParams(params,transform);
String filesPath = "/tmp/"+UUID.randomUUID()+"/";
try{
createXMLFilesFromData(data, filesPath);
@@ -78,14 +85,18 @@ public class Saxon implements XmlEngine{
/**
* Transforms string containing xml document via xslt
* @param data xml to be transformed
*
* @param params
* @param data xml to be transformed
* @param transform xslt
* @return transformed xml
* @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);
XsltCompiler compiler = processor.newXsltCompiler();
transform = tools.addParams(params,transform);
System.out.println(transform);
XsltExecutable stylesheet = compiler.compile(new StreamSource(new StringReader(transform)));
StringWriter sw = new StringWriter();
Serializer out = processor.newSerializer(sw);
@@ -164,9 +175,4 @@ public class Saxon implements XmlEngine{
public String getVersion() {
return "Saxon " + new Processor(false).getSaxonProductVersion();
}
@Override
public String addParam(String data, String processorData) throws Exception {
return null;
}
}

View File

@@ -1,7 +1,10 @@
package com.r11.tools.xml;
import com.r11.tools.model.Param;
import com.r11.tools.model.XMLMultipleFilesData;
import com.r11.tools.model.XMLRequestBody;
import com.r11.tools.model.XPathQueryResult;
import com.r11.tools.model.XmlTools;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -22,6 +25,7 @@ import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.List;
/**
* Handler for Xalan engine
@@ -31,16 +35,20 @@ public class Xalan implements XmlEngine{
/**
* Transforms string containing xml document via xslt
* @param data xml to be transformed
*
* @param params
* @param data xml to be transformed
* @param transform xslt
* @return transformed xml
* @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();
DocumentBuilder builder = factory.newDocumentBuilder();
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));
Transformer transformer = TransformerFactory.newInstance().newTransformer(stylesource);
transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
@@ -62,7 +70,7 @@ public class Xalan implements XmlEngine{
}
@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");
}
@@ -124,11 +132,6 @@ public class Xalan implements XmlEngine{
return org.apache.xalan.Version.getVersion();
}
@Override
public String addParam(String data, String processorData) throws Exception {
return null;
}
/**
* Validates string representation of the xml document against xsd schema
* @param data xml document

View File

@@ -1,15 +1,17 @@
package com.r11.tools.xml;
import com.r11.tools.model.Param;
import com.r11.tools.model.XMLMultipleFilesData;
import com.r11.tools.model.XPathQueryResult;
import java.util.List;
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;
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 executeXQuery(String data, String xquery, String version) throws Exception;
public String getVersion();
String addParam(String processorData, String paramName, String paramValue) throws Exception;
}

View File

@@ -2,106 +2,71 @@
import {ref} from 'vue'
const emit = defineEmits<{
(event: 'update-value', value: string): void;
(event: 'update-value', options: { name: string }[]): void;
}>();
const props = defineProps({
xslt: {type: String, required: true}
})
const options = ref<{ name: string }[]>([
{ name: "Add Param" }
]);
const sendToParent = (xslt: string) => {
emit('update-value', xslt);
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 options = ref<{ name: string }[]>([
{ name: "Add Param" },
{ name: "Set Param" },
]);
const selectedOption = ref(options.value[0].name);
const isNumeric = (string : string) => /^[+-]?\d+(\.\d+)?$/.test(string)
const selectedFunction = () => {
if(selectedOption.value === "Add Param") {
sendRequest("addParam");
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 = "";
}
else {
sendRequest("setParam")
}
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();
};
const sendRequest = (type:string) => {
console.log(type)
let request: Request = prepareRequest(type)
fetchRequest(request).then((body) => {
const result = (body as any).result;
sendToParent(result);
});
function selectOption(option: string): string {
return option == "Add Param" ? "Add Param" : "Remove Param"
}
function prepareRequest(type :string): Request {
let request = new Request(prepareURL(), {
body: prepareRequestBody(type),
method: "POST"
});
return request
}
function prepareURL(): string {
//const engineEndpoint = engine.value == "libxml" ? "libxml" : "java";
return document.location.protocol + "//" + document.location.hostname + "/" + "java" + "/xslt/param";
//return "http://localhost:8081/xslt/param";
}
function prepareRequestBody(type: string): string {
let requestBody = JSON.stringify({
"processorData": props.xslt,
"paramName": nameInput.value,
"paramValue": valueInput.value,
"type": type
});
console.log(requestBody);
return requestBody;
}
async function fetchRequest(request: Request): Promise<JSON> {
console.log(request)
let responseBody = await fetch(request)
return await responseBody.json()
// .then(response => response.json())
// .then((body) => body)
//console.log(responseBody);
//return responseBody
}
</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="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
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>
<input
id="NameTextInput"
v-model="nameInput"
class="text-input px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
type="text"
placeholder="Name"
/>
<input
id="ValueTextInput"
v-model="valueInput"
class="text-input px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
type="text"
placeholder="Value"
/>
<button class="tool-button" @click="selectedFunction">{{selectedOption}}</button>
</template>

View File

@@ -6,21 +6,26 @@ import XsltParamComponent from '@/components/XsltParamComponent.vue'
import {ref} from 'vue'
const props = defineProps(
{
stylizedName: {type: String, required: true},
data: {type: String},
}
)
const emit = defineEmits(['update:modelValue'])
const props = defineProps<{
stylizedName: string;
data?: string;
params?: { name: string }[];
}>();
const emit = defineEmits(['update:modelValue','update:params'])
const data = ref('')
const inputFile = ref()
const params = ref<{ name: string }[]>([]);
function sendValue() {
emit('update:modelValue', data.value)
}
function updateParams(newParams: { name: string }[]) {
emit('update:params', newParams);
}
function updateData(newData: string, clearFileSelector: boolean = true) {
data.value = newData
@@ -54,8 +59,12 @@ function readFile(file: any) {
}
reader.readAsText(file.target.files[0])
}
const handleUpdateValue = (value: string) => {data.value = value};
const handleUpdateValue = (options: { name: string }[]) => {
console.log("from parent" +options.length)
params.value = options
updateParams(params.value)
};
</script>
@@ -78,10 +87,8 @@ const handleUpdateValue = (value: string) => {data.value = value};
</div>
</div>
<div class="flex place-content-between w-full items-center">
<div v-if="addParameters()" class="flex justify-end space-x-2 pb-2 overflow-x-auto ml-auto">
<XsltParamComponent @update-value="handleUpdateValue" :xslt="data"/>
</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>

View File

@@ -1,21 +1,22 @@
<script setup lang="ts">
import { onMounted, ref } from 'vue';
import { type TabData } from '../common/TabData'
import {onMounted, ref} from 'vue';
import {type TabData} from '../common/TabData'
import CodeEditor from '@/components/common/CodeEditorComponent.vue';
const props = defineProps(
{
tool: {type: String, required: true},
xml: {type: [String, Array<TabData>], required: true},
query: {type: String, required: true}
}
)
const props = defineProps<{
tool: string;
xml: string | TabData[];
query: string;
params?: { name: string }[];
}>();
const emit = defineEmits(["update"]);
const result = ref('');
let enginesForCurrentTool = ref(["saxon", "xalan", "libxml"]);
const formattedParams = ref();
const allVersions = ["1.0", "2.0", "3.0", "3.1"];
let versionsForCurrentEngine = ref([""]);
@@ -86,7 +87,9 @@ function selectDefaultVersion() {
}
function process() {
let request:Request = prepareRequest();
props.params?.forEach((param) => {console.log(param.name)})
let request:Request = prepareRequest();
fetchRequest(request).then((data) => {
updateOutputField(data);
})
@@ -99,6 +102,7 @@ function updateOutputField(data: any) {
}
function prepareRequest():Request {
formattedParams.value = formatParams()
let request = new Request(prepareURL(), {
body: selectRequestBodyType(),
method: "POST"
@@ -125,24 +129,35 @@ function selectRequestBodyType() : string {
else
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 {
let requestBody = JSON.stringify({
let requestBody = JSON.stringify({
"params": formattedParams.value,
"data": data,
"processorData": props.query,
"processor": engine.value,
"version": version.value
});
console.log(requestBody);
return requestBody;
}
function prepareRequestBodyMultiXml():string {
if (!Array.isArray(props.xml))
if (!Array.isArray(props.xml))
return "";
let xmlFilesArray = convertDataArray(props.xml);
let requestBody = JSON.stringify({
"params": formattedParams.value,
"data": xmlFilesArray,
"processorData": props.query,
"processor": engine.value,

View File

@@ -11,6 +11,7 @@ import { ref } from 'vue';
const xml = ref(new Array<TabData>);
const query = ref('');
const version = ref('');
const params = ref<{ name: string }[]>([]);
function updateVersion(newVersion: string) {
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 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>
<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>
<xmlOutputFieldComponent tool="xslt" :xml="xml" :query="query" @update="updateVersion"></xmlOutputFieldComponent>
<xmlOutputFieldComponent tool="xslt" :xml="xml" :query="query" :params="params" @update="updateVersion"></xmlOutputFieldComponent>
</div>
<TooltipComponent tool-type="xslt" :version="version"></TooltipComponent>
</div>