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

Removed unneded method

Browse Source
This commit is contained in:
Adam Bem
2023-10-26 11:48:02 +02:00
parent c153e34e22
commit 928cd78acd
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java
View File

@@ -67,11 +67,11 @@ public class XmlController implements RestController {
switch (requestBody.getProcessor().toLowerCase()) { switch (requestBody.getProcessor().toLowerCase()) {
case "saxon": case "saxon":
process(new XmlJob(response, requestBody, saxon, xmlJobType)); processRequest(new XmlJob(response, requestBody, saxon, xmlJobType));
return; return;
case "xalan": case "xalan":
process(new XmlJob(response, requestBody, xalan, xmlJobType)); processRequest(new XmlJob(response, requestBody, xalan, xmlJobType));
return; return;
default: default:
@@ -79,13 +79,13 @@ public class XmlController implements RestController {
} }
} }
private void process(XmlJob xmlJob) { private void processRequest(XmlJob xmlJob) {
XMLResponseBody responseBody = null; XMLResponseBody responseBody = null;
long timeStart = System.currentTimeMillis(); long timeStart = System.currentTimeMillis();
long duration; long duration;
try { try {
responseBody = selectProcessMethod(xmlJob); responseBody = processData(xmlJob);
duration = System.currentTimeMillis() - timeStart; duration = System.currentTimeMillis() - timeStart;
responseBody.setDuration(duration); responseBody.setDuration(duration);
@@ -105,7 +105,7 @@ public class XmlController implements RestController {
} }
private XMLResponseBody selectProcessMethod(XmlJob xmlJob) throws Exception { private XMLResponseBody processData(XmlJob xmlJob) throws Exception {
if (xmlJob.getXmlJobType() == XmlJobType.XPath) if (xmlJob.getXmlJobType() == XmlJobType.XPath)
return processXPath(xmlJob); return processXPath(xmlJob);
else else
@@ -152,7 +152,8 @@ public class XmlController implements RestController {
XmlJobType xmlJobType = xmlJob.getXmlJobType(); XmlJobType xmlJobType = xmlJob.getXmlJobType();
Response response = xmlJob.getResponse(); Response response = xmlJob.getResponse();
XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), engine.getVersion()); XMLResponseBody responseBody =
new XMLResponseBody(ex.getMessage(), "ERR", engine.getVersion(), -1);
response.status(400); response.status(400);
this.logger.error("Error on processing " + xmlJobType + " using " + engine.getVersion() + ". " + ex); this.logger.error("Error on processing " + xmlJobType + " using " + engine.getVersion() + ". " + ex);
@@ -162,18 +163,14 @@ public class XmlController implements RestController {
private void invalidEngineSelectedResponse(Response response) { private void invalidEngineSelectedResponse(Response response) {
XMLResponseBody responseBody = XMLResponseBody responseBody =
prepareErrorResponseBody("Valid engines are: saxon, xalan", "N/A"); new XMLResponseBody("Valid engines are: saxon, xalan", "ERR", "N/A", -1);
response.body(this.gson.toJson(responseBody)); response.body(this.gson.toJson(responseBody));
response.status(400); response.status(400);
} }
private void requestErrorResponse(Response response, Exception ex) { private void requestErrorResponse(Response response, Exception ex) {
XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), "N/A"); XMLResponseBody responseBody = new XMLResponseBody(ex.getMessage(), "ERR", "N/A", -1);
response.status(400); response.status(400);
response.body(this.gson.toJson(responseBody)); response.body(this.gson.toJson(responseBody));
} }
private XMLResponseBody prepareErrorResponseBody(String message, String processor) {
return new XMLResponseBody(message, "ERR", processor, -1);
}
} }