From ec1ef38c57121d7cbd628a266f9f838be59826bc Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Wed, 7 Jun 2023 10:46:33 +0200 Subject: [PATCH] Removed unnessesary arguments in methods --- .../com/r11/tools/controller/XPathController.java | 11 ++++++----- .../com/r11/tools/controller/XQueryController.java | 6 ++---- .../java/com/r11/tools/controller/XsdController.java | 3 +-- .../com/r11/tools/controller/XsltController.java | 12 +++++++----- .../tools/controller/internal/XMLRequestBody.java | 4 ++++ 5 files changed, 20 insertions(+), 16 deletions(-) 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 e3f426c..5bbdc97 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 @@ -52,20 +52,20 @@ public class XPathController implements RestController { return; } - JsonObject responseJson = new JsonObject(); switch (requestBody.getProcessor()) { case "saxon": - processWithSaxon(response, requestBody, responseJson); + processWithSaxon(response, requestBody); break; case "xalan": - processWithXalan(response, requestBody, responseJson); + processWithXalan(response, requestBody); break; default: response.body("saxon, xalan"); } } - private void processWithXalan(Response response, XMLRequestBody requestBody, JsonObject responseJson) { + private void processWithXalan(Response response, XMLRequestBody requestBody) { + JsonObject responseJson = new JsonObject(); long timeStart = System.currentTimeMillis(); try { XPathQueryResult xPathQueryResult = @@ -93,7 +93,8 @@ public class XPathController implements RestController { } - private void processWithSaxon(Response response, XMLRequestBody requestBody, JsonObject responseJson) { + private void processWithSaxon(Response response, XMLRequestBody requestBody) { + JsonObject responseJson = new JsonObject(); long timeStart = System.currentTimeMillis(); try { String result = diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/XQueryController.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/XQueryController.java index eb3499a..16c3701 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/controller/XQueryController.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/XQueryController.java @@ -36,7 +36,6 @@ public class XQueryController implements RestController { @ScopedControllerManifest(method = HandlerType.POST, path = "/xquery") public void transform(Request request, Response response) { - XMLRequestBody requestBody; JsonObject responseJson; try { @@ -50,9 +49,8 @@ public class XQueryController implements RestController { } try { - if (requestBody.getProcessor().equals("saxon")) { + if (requestBody.getProcessor().equals("saxon")) processWithSaxon(response, requestBody); - } else response.body("saxon"); } catch (Exception e) { @@ -84,7 +82,7 @@ public class XQueryController implements RestController { } catch (Exception ex) { response.status(400); responseJson = prepareErrorResponse(ex.getMessage(), saxon.getVersion()); - + this.logger.error("Error on processing XQuery using Saxon. " + ex); } finally { diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/XsdController.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/XsdController.java index 854684d..e348791 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/controller/XsdController.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/XsdController.java @@ -33,11 +33,10 @@ public class XsdController implements RestController { } @ScopedControllerManifest(method = HandlerType.POST, path = "/xsd") public Response transform(Request request, Response response) { - String body = request.body(); XMLRequestBody requestBody; try { - requestBody = this.gson.fromJson(body, XMLRequestBody.class); + requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class); } catch (Exception e) { JsonObject responseJson = prepareErrorResponse(e.getMessage(), "N/A"); diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/XsltController.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/XsltController.java index 0e15753..43ab35b 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/controller/XsltController.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/XsltController.java @@ -51,14 +51,14 @@ public class XsltController implements RestController { response.body("saxon, xalan"); return; } - JsonObject responseJson = new JsonObject(); + switch (requestBody.getProcessor()) { case "saxon": - processWithSaxon(response, requestBody, responseJson); + processWithSaxon(response, requestBody); return; case "xalan": - processWithXalan(response, requestBody, responseJson); + processWithXalan(response, requestBody); return; default: @@ -66,7 +66,8 @@ public class XsltController implements RestController { } } - private void processWithXalan(Response response, XMLRequestBody requestBody, JsonObject responseJson) { + private void processWithXalan(Response response, XMLRequestBody requestBody) { + JsonObject responseJson = new JsonObject(); long timeStart = System.currentTimeMillis(); try { String result = xalan.processXSLT(requestBody.getData(), requestBody.getProcess()); @@ -92,7 +93,8 @@ public class XsltController implements RestController { } - private void processWithSaxon(Response response, XMLRequestBody requestBody, JsonObject responseJson) { + private void processWithSaxon(Response response, XMLRequestBody requestBody) { + JsonObject responseJson = new JsonObject(); long timeStart = System.currentTimeMillis(); try { String result = saxon.processXSLT(requestBody.getData(), requestBody.getProcess()); 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 index 08576ce..3d1933e 100644 --- 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 @@ -2,6 +2,10 @@ package com.r11.tools.controller.internal; import com.google.gson.annotations.SerializedName; +/** + * POJO class used to contain body of XML related requests + * @author Adam + */ public class XMLRequestBody { @SerializedName("data") private String data;