From 800c88fc62426c1d5ff556c35dfe59fbfa6aa0c9 Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Wed, 7 Jun 2023 10:31:34 +0200
Subject: [PATCH] Added XMLRequestBody class and implemented it in XPath
 controller

---
 .../r11/tools/controller/XPathController.java | 30 +++++++++----------
 .../controller/internal/XMLRequestBody.java   | 30 +++++++++++++++++++
 2 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XMLRequestBody.java

diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/XPathController.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/XPathController.java
index 14e4847..e3f426c 100644
--- a/Backend/tools-services/src/main/java/com/r11/tools/controller/XPathController.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/XPathController.java
@@ -37,9 +37,9 @@ public class XPathController implements RestController {
     public void transform(Request request, Response response) {
         String body = request.body();
 
-        JsonObject requestJson;
+        XMLRequestBody requestBody;
         try {
-            requestJson = this.gson.fromJson(body, JsonObject.class);
+            requestBody = this.gson.fromJson(body, XMLRequestBody.class);
         } catch (Exception e) {
             JsonObject responseJson = prepareErrorResponse(e.getMessage(), "N/A");
             response.status(400);
@@ -47,33 +47,29 @@ public class XPathController implements RestController {
             return;
         }
 
-        String data = requestJson.get("data").getAsString();
-        String query = requestJson.get("process").getAsString();
-        String processor = requestJson.get("processor").getAsString();
-        String version = requestJson.get("version").getAsString();
-
-        if (processor == null) {
+        if (requestBody.getProcessor() == null) {
             response.body("saxon, xalan");
             return;
         }
 
         JsonObject responseJson = new JsonObject();
-        switch (processor) {
+        switch (requestBody.getProcessor()) {
             case "saxon":
-                processWithSaxon(response, data, query, version, responseJson);
+                processWithSaxon(response, requestBody, responseJson);
                 break;
             case "xalan":
-                processWithXalan(response, data, query, responseJson);
+                processWithXalan(response, requestBody, responseJson);
                 break;
             default:
                 response.body("saxon, xalan");
         }
     }
 
-    private void processWithXalan(Response response, String data, String query, JsonObject responseJson) {
+    private void processWithXalan(Response response, XMLRequestBody requestBody, JsonObject responseJson) {
         long timeStart = System.currentTimeMillis();
         try {
-            XPathQueryResult xPathQueryResult = xalan.processXPath(data, query, "");
+            XPathQueryResult xPathQueryResult =
+                    xalan.processXPath(requestBody.getData(), requestBody.getProcess(), "");
 
             response.status(200);
 
@@ -97,16 +93,18 @@ public class XPathController implements RestController {
 
     }
 
-    private void processWithSaxon(Response response, String data, String query, String version, JsonObject responseJson) {
+    private void processWithSaxon(Response response, XMLRequestBody requestBody, JsonObject responseJson) {
         long timeStart = System.currentTimeMillis();
         try {
-            String result = saxon.processXPath(data, query, version).getData().trim();
+            String result =
+                    saxon.processXPath(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion())
+                            .getData().trim();
 
             response.status(200);
 
             responseJson.addProperty("result", result);
             responseJson.addProperty("status", "OK");
-            responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version + " over s9api");
+            responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + requestBody.getVersion() + " over s9api");
 
             long duration = System.currentTimeMillis() - timeStart;
             responseJson.addProperty("time", duration);
diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XMLRequestBody.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XMLRequestBody.java
new file mode 100644
index 0000000..08576ce
--- /dev/null
+++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XMLRequestBody.java
@@ -0,0 +1,30 @@
+package com.r11.tools.controller.internal;
+
+import com.google.gson.annotations.SerializedName;
+
+public class XMLRequestBody {
+    @SerializedName("data")
+    private String data;
+    @SerializedName("process")
+    private String process;
+    @SerializedName("processor")
+    private String processor;
+    @SerializedName("version")
+    private String version;
+
+    public String getData() {
+        return data;
+    }
+
+    public String getProcess() {
+        return process;
+    }
+
+    public String getProcessor() {
+        return processor;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+}