From 0b405679d00422b445111bebfeed40424f42d72f Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 18 May 2023 10:05:12 +0200 Subject: [PATCH] Split XSLT process method --- .../r11/tools/controller/XsltController.java | 115 ++++++++++-------- 1 file changed, 62 insertions(+), 53 deletions(-) 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 966ea47..29e0fd6 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 @@ -57,69 +57,78 @@ public class XsltController implements RestController { response.body("saxon, xalan"); return; } - - String tmp; - long timeStart; - long duration; - JsonObject responseJson = new JsonObject(); switch (processor) { case "saxon": - timeStart = System.currentTimeMillis(); - try { - tmp = saxon.processXSLT(data, query); - - response.status(200); - - responseJson.addProperty("result", tmp); - responseJson.addProperty("status", "OK"); - } catch (Exception ex) { - this.logger.error("Error on processing XSLT using Saxon. " + ex); - - response.status(400); - - responseJson.addProperty("result", ex.getMessage()); - responseJson.addProperty("status", "ERR"); - } - - duration = System.currentTimeMillis() - timeStart; - this.logger.info("Request (XSLT, Saxon) processed in " + duration + " ms."); - - responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version); - responseJson.addProperty("time", duration); - - response.body(this.gson.toJson(responseJson)); + processWithSaxon(response, data, query, version, responseJson); return; case "xalan": - timeStart = System.currentTimeMillis(); - try { - tmp = xalan.processXSLT(data, query); - - response.status(200); - - responseJson.addProperty("result", tmp); - responseJson.addProperty("status", "OK"); - } catch (Exception ex) { - this.logger.error("Error on processing XSLT using Xalan. " + ex); - - response.status(400); - - responseJson.addProperty("result", ex.getMessage()); - responseJson.addProperty("status", "ERR"); - } - - duration = System.currentTimeMillis() - timeStart; - this.logger.info("Request (XSLT, Xalan) processed in " + duration + " ms."); - - responseJson.addProperty("processor", xalan.getVersion()); - responseJson.addProperty("time", duration); - - response.body(this.gson.toJson(responseJson)); + processWithXalan(response, data, query, responseJson); return; default: response.body("saxon, xalan"); } } + + private void processWithXalan(Response response, String data, String query, JsonObject responseJson) { + long duration; + long timeStart; + String tmp; + timeStart = System.currentTimeMillis(); + try { + tmp = xalan.processXSLT(data, query); + + response.status(200); + + responseJson.addProperty("result", tmp); + responseJson.addProperty("status", "OK"); + } catch (Exception ex) { + this.logger.error("Error on processing XSLT using Xalan. " + ex); + + response.status(400); + + responseJson.addProperty("result", ex.getMessage()); + responseJson.addProperty("status", "ERR"); + } + + duration = System.currentTimeMillis() - timeStart; + this.logger.info("Request (XSLT, Xalan) processed in " + duration + " ms."); + + responseJson.addProperty("processor", xalan.getVersion()); + responseJson.addProperty("time", duration); + + response.body(this.gson.toJson(responseJson)); + } + + private void processWithSaxon(Response response, String data, String query, String version, JsonObject responseJson) { + long duration; + String tmp; + long timeStart; + timeStart = System.currentTimeMillis(); + try { + tmp = saxon.processXSLT(data, query); + + response.status(200); + + responseJson.addProperty("result", tmp); + responseJson.addProperty("status", "OK"); + } catch (Exception ex) { + this.logger.error("Error on processing XSLT using Saxon. " + ex); + + response.status(400); + + responseJson.addProperty("result", ex.getMessage()); + responseJson.addProperty("status", "ERR"); + } + + duration = System.currentTimeMillis() - timeStart; + this.logger.info("Request (XSLT, Saxon) processed in " + duration + " ms."); + + responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version); + responseJson.addProperty("time", duration); + + response.body(this.gson.toJson(responseJson)); + } }