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 0330421..3a81302 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 @@ -67,11 +67,11 @@ public class XmlController implements RestController { switch (requestBody.getProcessor().toLowerCase()) { case "saxon": - process(new XmlJob(response, requestBody, saxon, xmlJobType)); + processRequest(new XmlJob(response, requestBody, saxon, xmlJobType)); return; case "xalan": - process(new XmlJob(response, requestBody, xalan, xmlJobType)); + processRequest(new XmlJob(response, requestBody, xalan, xmlJobType)); return; default: @@ -79,13 +79,13 @@ public class XmlController implements RestController { } } - private void process(XmlJob xmlJob) { + private void processRequest(XmlJob xmlJob) { XMLResponseBody responseBody = null; long timeStart = System.currentTimeMillis(); long duration; try { - responseBody = selectProcessMethod(xmlJob); + responseBody = processData(xmlJob); duration = System.currentTimeMillis() - timeStart; 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) return processXPath(xmlJob); else @@ -152,7 +152,8 @@ public class XmlController implements RestController { XmlJobType xmlJobType = xmlJob.getXmlJobType(); Response response = xmlJob.getResponse(); - XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), engine.getVersion()); + XMLResponseBody responseBody = + new XMLResponseBody(ex.getMessage(), "ERR", engine.getVersion(), -1); response.status(400); 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) { 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.status(400); } 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.body(this.gson.toJson(responseBody)); } - - private XMLResponseBody prepareErrorResponseBody(String message, String processor) { - return new XMLResponseBody(message, "ERR", processor, -1); - } }