R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Split XPath process method

Browse Source
This commit is contained in:
Adam Bem
2023-05-18 09:45:20 +02:00
parent e5ba646838
commit 49355a1bb6
1 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Backend/tools-services/src/main/java/com/r11/tools/controller/XPathController.java
View File

@@ -3,8 +3,6 @@ package com.r11.tools.controller;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.r11.tools.controller.internal.*; import com.r11.tools.controller.internal.*;
import com.r11.tools.xml.Saxon;
import com.r11.tools.xml.Xalan;
import com.r11.tools.xml.XmlEngine; import com.r11.tools.xml.XmlEngine;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import spark.Request; import spark.Request;
@@ -50,10 +48,6 @@ public class XPathController implements RestController {
String processor = requestJson.get("processor").getAsString(); String processor = requestJson.get("processor").getAsString();
String version = requestJson.get("version").getAsString(); String version = requestJson.get("version").getAsString();
String tmp = "";
long timeStart;
long duration;
if (processor == null) { if (processor == null) {
response.body("saxon, xalan"); response.body("saxon, xalan");
return; return;
@@ -62,35 +56,19 @@ public class XPathController implements RestController {
JsonObject responseJson = new JsonObject(); JsonObject responseJson = new JsonObject();
switch (processor) { switch (processor) {
case "saxon": case "saxon":
response.header("processor", "Saxon " + saxon.getVersion() + " " + version + " over s9api"); processWithSaxon(response, data, query, version, responseJson);
timeStart = System.currentTimeMillis(); break;
case "xalan":
try { processWithXalan(response, data, query, responseJson);
tmp = saxon.processXPath(data, query, version).getData().trim(); break;
default:
response.status(200); response.body("saxon, xalan");
}
responseJson.addProperty("result", tmp);
responseJson.addProperty("status", "OK");
} catch (Exception ex) {
this.logger.error("Error on processing XPath using Saxon. " + ex);
response.status(400);
responseJson.addProperty("result", ex.getMessage());
responseJson.addProperty("status", "ERR");
} }
duration = System.currentTimeMillis() - timeStart; private void processWithXalan(Response response, String data, String query, JsonObject responseJson) {
this.logger.info("Request (XPath, Saxon) processed in " + duration + " ms."); long timeStart;
long duration;
responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version + " over s9api");
responseJson.addProperty("time", duration);
response.body(this.gson.toJson(responseJson));
return;
case "xalan":
response.header("processor", xalan.getVersion()); response.header("processor", xalan.getVersion());
timeStart = System.currentTimeMillis(); timeStart = System.currentTimeMillis();
@@ -118,9 +96,37 @@ public class XPathController implements RestController {
responseJson.addProperty("time", duration); responseJson.addProperty("time", duration);
response.body(this.gson.toJson(responseJson)); response.body(this.gson.toJson(responseJson));
return;
default:
response.body("saxon, xalan");
} }
private void processWithSaxon(Response response, String data, String query, String version, JsonObject responseJson) {
long timeStart;
String tmp;
long duration;
response.header("processor", "Saxon " + saxon.getVersion() + " " + version + " over s9api");
timeStart = System.currentTimeMillis();
try {
tmp = saxon.processXPath(data, query, version).getData().trim();
response.status(200);
responseJson.addProperty("result", tmp);
responseJson.addProperty("status", "OK");
} catch (Exception ex) {
this.logger.error("Error on processing XPath using Saxon. " + ex);
response.status(400);
responseJson.addProperty("result", ex.getMessage());
responseJson.addProperty("status", "ERR");
}
duration = System.currentTimeMillis() - timeStart;
this.logger.info("Request (XPath, Saxon) processed in " + duration + " ms.");
responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version + " over s9api");
responseJson.addProperty("time", duration);
response.body(this.gson.toJson(responseJson));
} }
} }