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

@@ -49,10 +49,10 @@ public class XmlController implements RestController {
 
         switch (requestBody.getProcessor()) {
             case "saxon":
-                process(response, requestBody, saxon, XmlJobType.XPath);
+                process(new XmlJob(response, requestBody, saxon, XmlJobType.XPath));
                 break;
             case "xalan":
-                process(response, requestBody, xalan, XmlJobType.XPath);
+                process(new XmlJob(response, requestBody, xalan, XmlJobType.XPath));
                 break;
             default:
                 invalidEngineSelectedResponse(response);
@@ -74,7 +74,7 @@ public class XmlController implements RestController {
         }
 
         if (requestBody.getProcessor().equalsIgnoreCase("saxon"))
-            process(response, requestBody, saxon, XmlJobType.XQuery);
+            process(new XmlJob(response, requestBody, saxon, XmlJobType.XQuery));
         else
             invalidEngineSelectedResponse(response);
     }
@@ -94,7 +94,7 @@ public class XmlController implements RestController {
             return;
         }
         if (requestBody.getProcessor().equalsIgnoreCase("xalan"))
-            process(response, requestBody, xalan, XmlJobType.XSD);
+            process(new XmlJob(response, requestBody, xalan, XmlJobType.XSD));
         else
             invalidEngineSelectedResponse(response);
 
@@ -117,11 +117,11 @@ public class XmlController implements RestController {
 
         switch (requestBody.getProcessor()) {
             case "saxon":
-                process(response, requestBody, saxon, XmlJobType.XSLT);
+                process(new XmlJob(response, requestBody, saxon, XmlJobType.XSLT));
                 return;
 
             case "xalan":
-                process(response, requestBody, xalan, XmlJobType.XSLT);
+                process(new XmlJob(response, requestBody, xalan, XmlJobType.XSLT));
                 return;
 
             default:
@@ -129,37 +129,43 @@ public class XmlController implements RestController {
         }
     }
 
-    private void process(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
+    private void process(XmlJob xmlJob) {
         XMLResponseBody responseBody = null;
         long timeStart = System.currentTimeMillis();
         long duration;
 
         try {
-            responseBody = selectProcessMethod(response, requestBody, engine, xmlJobType);
+            responseBody = selectProcessMethod(xmlJob);
 
             duration = System.currentTimeMillis() - timeStart;
             responseBody.setDuration(duration);
 
-            response.status(200);
+            xmlJob.getResponse().status(200);
+
+            this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
+                    xmlJob.getEngine().getVersion() +
+                    ") processed in " + duration + " ms.");
 
-            this.logger.info("Request (" + xmlJobType + ", " + engine.getVersion() + ") processed in " + duration + " ms.");
         } catch (Exception ex) {
-            responseBody = processingErrorResponse(response, ex, engine, xmlJobType);
+            responseBody = processingErrorResponse(xmlJob.getResponse(), ex, xmlJob);
 
         } finally {
-            response.body(this.gson.toJson(responseBody));
+            xmlJob.getResponse().body(this.gson.toJson(responseBody));
         }
 
     }
 
-    private XMLResponseBody selectProcessMethod(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) throws Exception {
-        if (xmlJobType == XmlJobType.XPath)
-            return processXPath(response, requestBody, engine, xmlJobType);
+    private XMLResponseBody selectProcessMethod(XmlJob xmlJob) throws Exception {
+        if (xmlJob.getXmlJobType() == XmlJobType.XPath)
+            return processXPath(xmlJob);
         else
-            return processOther(response, requestBody, engine, xmlJobType);
+            return processOther(xmlJob);
     }
 
-    private XMLResponseBody processXPath(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) throws Exception {
+    private XMLResponseBody processXPath(XmlJob xmlJob) throws Exception {
+        XmlEngine engine = xmlJob.getEngine();
+        XMLRequestBody requestBody = xmlJob.getRequestBody();
+
         XPathQueryResult xPathQueryResult =
                 engine.processXPath(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion());
 
@@ -170,9 +176,12 @@ public class XmlController implements RestController {
         return responseBody;
     }
 
-    private XMLResponseBody processOther(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) throws Exception {
+    private XMLResponseBody processOther(XmlJob xmlJob) throws Exception {
+        XmlEngine engine = xmlJob.getEngine();
+        XMLRequestBody requestBody = xmlJob.getRequestBody();
+
         String result = null;
-        switch (xmlJobType) {
+        switch (xmlJob.getXmlJobType()) {
             case XSLT:
                 result = engine.processXSLT(requestBody.getData(), requestBody.getProcess());
                 break;
@@ -185,13 +194,18 @@ public class XmlController implements RestController {
                         requestBody.getVersion());
                 break;
         }
-        return new XMLResponseBody(result, "OK", engine.getVersion());
+        return new XMLResponseBody(result, "OK", requestBody.getVersion());
     }
 
-    private XMLResponseBody processingErrorResponse(Response response, Exception ex, XmlEngine engine, XmlJobType xmlJobType) {
+    private XMLResponseBody processingErrorResponse(Response response, Exception ex, XmlJob xmlJob) {
+        XmlEngine engine = xmlJob.getEngine();
+        XmlJobType xmlJobType = xmlJob.getXmlJobType();
+
         XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), engine.getVersion());
+
         response.status(400);
         this.logger.error("Error on processing " + xmlJobType + " using " + engine.getVersion() + ". " + ex);
+
         return responseBody;
     }
 

Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJob.java

@@ -0,0 +1,35 @@
+package com.r11.tools.controller.internal;
+
+import com.r11.tools.model.XMLRequestBody;
+import com.r11.tools.xml.XmlEngine;
+import spark.Response;
+
+public class XmlJob {
+    private final Response response;
+    private final XMLRequestBody requestBody;
+    private final XmlEngine engine;
+    private final XmlJobType xmlJobType;
+
+    public XmlJob(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
+        this.response = response;
+        this.requestBody = requestBody;
+        this.engine = engine;
+        this.xmlJobType = xmlJobType;
+    }
+
+    public Response getResponse() {
+        return response;
+    }
+
+    public XMLRequestBody getRequestBody() {
+        return requestBody;
+    }
+
+    public XmlEngine getEngine() {
+        return engine;
+    }
+
+    public XmlJobType getXmlJobType() {
+        return xmlJobType;
+    }
+}