diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java index 4c07138..7759a62 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java @@ -117,7 +117,7 @@ public class XmlController implements RestController { XMLRequestBody requestBody = xmlJob.getRequestBody(); XPathQueryResult xPathQueryResult = - engine.processXPath(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion()); + engine.processXPath(requestBody.getData(), requestBody.getProcessorData(), requestBody.getVersion()); return new XMLResponseBody(xPathQueryResult.getData().trim(), "OK", engine.getVersion(), xPathQueryResult.getType()); @@ -130,14 +130,14 @@ public class XmlController implements RestController { String result = null; switch (xmlJob.getXmlJobType()) { case XSLT: - result = engine.processXSLT(requestBody.getData(), requestBody.getProcess()); + result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData()); break; case XSD: - result = engine.validate(requestBody.getData(), requestBody.getProcess()).trim(); + result = engine.validate(requestBody.getData(), requestBody.getProcessorData()).trim(); break; case XQuery: result = engine.executeXQuery(requestBody.getData(), - requestBody.getProcess(), + requestBody.getProcessorData(), requestBody.getVersion()); break; } diff --git a/Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java b/Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java index 52e89eb..e7b06aa 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java @@ -4,13 +4,13 @@ import com.google.gson.annotations.SerializedName; /** * POJO class used to contain body of XML related requests - * @author Adam + * @author Adam Bem */ public class XMLRequestBody { @SerializedName("data") private String data; - @SerializedName("process") - private String process; + @SerializedName("processorData") + private String processorData; @SerializedName("processor") private String processor; @SerializedName("version") @@ -20,8 +20,8 @@ public class XMLRequestBody { return data; } - public String getProcess() { - return process; + public String getProcessorData() { + return processorData; } public String getProcessor() { diff --git a/Frontend/src/components/xml/XmlOutputFieldComponent.vue b/Frontend/src/components/xml/XmlOutputFieldComponent.vue index e0d140d..2857d2c 100644 --- a/Frontend/src/components/xml/XmlOutputFieldComponent.vue +++ b/Frontend/src/components/xml/XmlOutputFieldComponent.vue @@ -100,7 +100,7 @@ function prepareURL(): string { function prepareRequestBody():string { var requestBody = JSON.stringify({ "data": props.xml, - "process": props.query, + "processorData": props.query, "processor": engine.value, "version": version.value });