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

Added XQuery Tool and refactored tools-service #220

Merged
bema merged 30 commits from bema/func/xquery into master 2023-06-12 10:53:24 +02:00
Conversation 1 Commits 30 Files Changed 21 +3 -7
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f7301c45ad - Show all commits

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

@@ -32,7 +32,6 @@ public class XPathController implements RestController {
@ScopedControllerManifest(method = HandlerType.POST, path = "/xpath") @ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
public void acceptRequest(Request request, Response response) { public void acceptRequest(Request request, Response response) {
XMLRequestBody requestBody; XMLRequestBody requestBody;
try { try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class); requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);

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

@@ -69,7 +69,7 @@ public class XQueryController implements RestController {
long duration = System.currentTimeMillis() - timeStart; long duration = System.currentTimeMillis() - timeStart;
responseBody = new XMLResponseBody(result, "OK", engine.getVersion(), duration); responseBody = new XMLResponseBody(result, "OK", engine.getVersion(), duration);
this.logger.info("Request (XQuery, " + engine.getVersion() + " processed in " + duration + " ms."); this.logger.info("Request (XQuery, " + engine.getVersion() + ") processed in " + duration + " ms.");
} catch (Exception ex) { } catch (Exception ex) {
response.status(400); response.status(400);
responseBody = prepareErrorResponse(ex.getMessage(), engine.getVersion()); responseBody = prepareErrorResponse(ex.getMessage(), engine.getVersion());

1
Backend/tools-services/src/main/java/com/r11/tools/controller/XsdController.java
View File

@@ -28,7 +28,6 @@ public class XsdController implements RestController {
} }
@ScopedControllerManifest(method = HandlerType.POST, path = "/xsd") @ScopedControllerManifest(method = HandlerType.POST, path = "/xsd")
public void acceptRequest(Request request, Response response) { public void acceptRequest(Request request, Response response) {
XMLRequestBody requestBody = null; XMLRequestBody requestBody = null;
try { try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class); requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);

6
Backend/tools-services/src/main/java/com/r11/tools/controller/XsltController.java
View File

@@ -30,11 +30,9 @@ public class XsltController implements RestController {
} }
@ScopedControllerManifest(method = HandlerType.POST, path = "/xslt") @ScopedControllerManifest(method = HandlerType.POST, path = "/xslt")
public void acceptRequest(Request request, Response response) { public void acceptRequest(Request request, Response response) {
String body = request.body();
XMLRequestBody requestBody; XMLRequestBody requestBody;
try { try {
requestBody = this.gson.fromJson(body, XMLRequestBody.class); requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
} catch (Exception e) { } catch (Exception e) {
XMLResponseBody responseBody = prepareErrorResponse(e.getMessage(), "N/A"); XMLResponseBody responseBody = prepareErrorResponse(e.getMessage(), "N/A");
@@ -72,7 +70,7 @@ public class XsltController implements RestController {
long duration = System.currentTimeMillis() - timeStart; long duration = System.currentTimeMillis() - timeStart;
responseBody = new XMLResponseBody(result, "OK", engine.getVersion(), duration); responseBody = new XMLResponseBody(result, "OK", engine.getVersion(), duration);
this.logger.info("Request (XSLT, " + engine.getVersion() + "processed in " + duration + " ms."); this.logger.info("Request (XSLT, " + engine.getVersion() + ") processed in " + duration + " ms.");
} catch (Exception ex) { } catch (Exception ex) {
responseBody = prepareErrorResponse(ex.getMessage(), engine.getVersion()); responseBody = prepareErrorResponse(ex.getMessage(), engine.getVersion());
response.status(400); response.status(400);