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

Removed unnessesary arguments in methods

Browse Source
This commit is contained in:
Adam Bem
2023-06-07 10:46:33 +02:00
parent 4d9ef6d3c7
commit ec1ef38c57
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,20 +52,20 @@ public class XPathController implements RestController {
return; return;
} }
JsonObject responseJson = new JsonObject();
switch (requestBody.getProcessor()) { switch (requestBody.getProcessor()) {
case "saxon": case "saxon":
processWithSaxon(response, requestBody, responseJson); processWithSaxon(response, requestBody);
break; break;
case "xalan": case "xalan":
processWithXalan(response, requestBody, responseJson); processWithXalan(response, requestBody);
break; break;
default: default:
response.body("saxon, xalan"); 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(); long timeStart = System.currentTimeMillis();
try { try {
XPathQueryResult xPathQueryResult = 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(); long timeStart = System.currentTimeMillis();
try { try {
String result = String result =

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

@@ -36,7 +36,6 @@ public class XQueryController implements RestController {
@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; JsonObject responseJson;
try { try {
@@ -50,9 +49,8 @@ public class XQueryController implements RestController {
} }
try { try {
if (requestBody.getProcessor().equals("saxon")) { if (requestBody.getProcessor().equals("saxon"))
processWithSaxon(response, requestBody); processWithSaxon(response, requestBody);
}
else else
response.body("saxon"); response.body("saxon");
} catch (Exception e) { } catch (Exception e) {
@@ -84,7 +82,7 @@ public class XQueryController implements RestController {
} catch (Exception ex) { } catch (Exception ex) {
response.status(400); response.status(400);
responseJson = prepareErrorResponse(ex.getMessage(), saxon.getVersion()); responseJson = 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 {

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

@@ -33,11 +33,10 @@ public class XsdController implements RestController {
} }
@ScopedControllerManifest(method = HandlerType.POST, path = "/xsd") @ScopedControllerManifest(method = HandlerType.POST, path = "/xsd")
public Response transform(Request request, Response response) { public Response transform(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) {
JsonObject responseJson = prepareErrorResponse(e.getMessage(), "N/A"); JsonObject responseJson = prepareErrorResponse(e.getMessage(), "N/A");

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

@@ -51,14 +51,14 @@ public class XsltController implements RestController {
response.body("saxon, xalan"); response.body("saxon, xalan");
return; return;
} }
JsonObject responseJson = new JsonObject();
switch (requestBody.getProcessor()) { switch (requestBody.getProcessor()) {
case "saxon": case "saxon":
processWithSaxon(response, requestBody, responseJson); processWithSaxon(response, requestBody);
return; return;
case "xalan": case "xalan":
processWithXalan(response, requestBody, responseJson); processWithXalan(response, requestBody);
return; return;
default: 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(); long timeStart = System.currentTimeMillis();
try { try {
String result = xalan.processXSLT(requestBody.getData(), requestBody.getProcess()); 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(); long timeStart = System.currentTimeMillis();
try { try {
String result = saxon.processXSLT(requestBody.getData(), requestBody.getProcess()); String result = saxon.processXSLT(requestBody.getData(), requestBody.getProcess());

4
Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XMLRequestBody.java
View File

@@ -2,6 +2,10 @@ package com.r11.tools.controller.internal;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
/**
* POJO class used to contain body of XML related requests
* @author Adam
*/
public class XMLRequestBody { public class XMLRequestBody {
@SerializedName("data") @SerializedName("data")
private String data; private String data;