R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed sending parameters

Browse Source
This commit is contained in:
Wojciech Szewczyk
2025-01-23 18:59:41 +01:00
parent b7af1eb33a
commit 04e37258bf
7 changed files with 249 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Backend/tools-services/pom.xml
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>

60
Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java
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,13 @@ 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 +79,23 @@ public class XmlController implements RestController {
return;
}
if (requestBody.getProcessor() == null ) {
if(requestBody.getProcessorData() != null){
processRequest(new XmlJob(response, requestBody, xmlJobType));
if (requestBody.getType() != null) {
String status;
if (Objects.equals(requestBody.getType(), "add")) {
status = tools.createNewParam(requestBody.getParamName(), requestBody.getParamValue());
} else if (Objects.equals(requestBody.getType(), "remove")) {
status = tools.removeParam(requestBody.getParamName(), requestBody.getParamValue());
}else {
unknownOperationType(response);
return;
}
System.out.println("getProcessor=null");
XMLResponseBody responseBody = new XMLResponseBody(status);
response.body(this.gson.toJson(responseBody));
return;
}
if (requestBody.getProcessor() == null) {
invalidEngineSelectedResponse(response);
return;
}
@@ -103,9 +126,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,13 +163,6 @@ 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());
break;
@@ -159,17 +175,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();
@@ -191,6 +199,12 @@ public class XmlController implements RestController {
response.body(this.gson.toJson(responseBody));
response.status(400);
}
private void unknownOperationType(Response response) {
XMLResponseBody responseBody =
new XMLResponseBody("You can only add and remove parameters", "ERR", "N/A", -1);
response.body(this.gson.toJson(responseBody));
response.status(400);
}
private void requestErrorResponse(Response response, Exception ex) {
XMLResponseBody responseBody = new XMLResponseBody(ex.getMessage(), "ERR", "N/A", -1);

4
Backend/tools-services/src/main/java/com/r11/tools/model/XMLResponseBody.java
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;

82
Backend/tools-services/src/main/java/com/r11/tools/model/XmlTools.java Normal file
View File

@@ -0,0 +1,82 @@
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.Map;
public class XmlTools {
private final Map<String, String> createdParameters = new HashMap<>();
private final int paramsLimit = 1000;
private final String errorMessage = "ERR";
private final String succesMessage = "OK";
private final String parameter = "xsl:param";
private final String nameAttribute = "name";
private final String valueAttribute = "select";
private void createNewNode(String paramName, String paramValue, Document doc) {
Element param = doc.createElement(parameter);
param.setAttribute(nameAttribute, paramName);
param.setAttribute(valueAttribute, "'" + paramValue + "'");
doc.getDocumentElement().appendChild(param);
}
public String addParams(String processorData ) {
try {
Document doc = addNode(processorData);
return docToString(doc);
} catch (ParserConfigurationException | SAXException | IOException | TransformerException e) {
throw new RuntimeException(e);
}
}
public String createNewParam(String paramName, String paramValue) {
if(createdParameters.size()<paramsLimit){
createdParameters.put(paramName, paramValue);
return succesMessage;
}else {
return errorMessage;
}
}
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();
}
public String removeParam(String paramName, String paramValue) {
return createdParameters.remove(paramName,paramValue) ? succesMessage : errorMessage;
}
}