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

Implemented reponse POJO in XQuery controller

Browse Source
This commit is contained in:
Adam Bem
2023-06-07 11:32:04 +02:00
parent 2f8e1dd052
commit e7e79281df
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Backend/tools-services/src/main/java/com/r11/tools/controller/XQueryController.java
View File

@@ -4,6 +4,7 @@ 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.model.XMLRequestBody; import com.r11.tools.model.XMLRequestBody;
import com.r11.tools.model.XMLResponseBody;
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;
@@ -26,26 +27,20 @@ public class XQueryController implements RestController {
this.saxon = saxon; this.saxon = saxon;
} }
private JsonObject prepareErrorResponse(String message, String processor) { private XMLResponseBody prepareErrorResponse(String message, String processor) {
JsonObject result = new JsonObject(); return new XMLResponseBody(message, "ERR", processor, -1);
result.addProperty("result", message);
result.addProperty("processor", processor);
result.addProperty("status", "ERR");
result.addProperty("time", "N/A");
return result;
} }
@ScopedControllerManifest(method = HandlerType.POST, path = "/xquery") @ScopedControllerManifest(method = HandlerType.POST, path = "/xquery")
public void transform(Request request, Response response) { public void transform(Request request, Response response) {
XMLRequestBody requestBody; XMLRequestBody requestBody;
JsonObject responseJson;
try { try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class); requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
} catch (Exception e) { } catch (Exception e) {
responseJson = prepareErrorResponse(e.getMessage(), "N/A"); XMLResponseBody responseBody = prepareErrorResponse(e.getMessage(), "N/A");
response.status(400); response.status(400);
response.body(this.gson.toJson(responseJson)); response.body(this.gson.toJson(responseBody));
return; return;
} }
@@ -55,39 +50,35 @@ public class XQueryController implements RestController {
else else
response.body("saxon"); response.body("saxon");
} catch (Exception e) { } catch (Exception e) {
responseJson = prepareErrorResponse(e.getMessage(), "Saxon"); XMLResponseBody responseBody = prepareErrorResponse(e.getMessage(), "Saxon");
response.status(400); response.status(400);
response.body(this.gson.toJson(responseJson)); response.body(this.gson.toJson(responseBody));
} }
} }
private void processWithSaxon(Response response, XMLRequestBody requestBody) { private void processWithSaxon(Response response, XMLRequestBody requestBody) {
JsonObject responseJson = new JsonObject(); XMLResponseBody responseBody = null;
long timeStart = System.currentTimeMillis(); long timeStart = System.currentTimeMillis();
try { try {
String result = saxon.executeXQuery(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion()); String result = saxon.executeXQuery(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion());
response.status(200); response.status(200);
responseJson.addProperty("result", result);
responseJson.addProperty("status", "OK");
responseJson.addProperty("processor", "Saxon " + saxon.getVersion());
long duration = System.currentTimeMillis() - timeStart; long duration = System.currentTimeMillis() - timeStart;
responseJson.addProperty("time", duration); responseBody = new XMLResponseBody(result, "OK", saxon.getVersion(), duration);
this.logger.info("Request (XQuery, Saxon) processed in " + duration + " ms."); this.logger.info("Request (XQuery, Saxon) processed in " + duration + " ms.");
} catch (Exception ex) { } catch (Exception ex) {
response.status(400); response.status(400);
responseJson = prepareErrorResponse(ex.getMessage(), saxon.getVersion()); responseBody = prepareErrorResponse(ex.getMessage(), saxon.getVersion());
this.logger.error("Error on processing XQuery using Saxon. " + ex); this.logger.error("Error on processing XQuery using Saxon. " + ex);
} }
finally { finally {
response.body(this.gson.toJson(responseJson)); response.body(this.gson.toJson(responseBody));
} }
} }