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

Removed duplicate code and adjusted captions #249

Merged
bema merged 15 commits from ref-func/cleaning_upload into master 2023-10-26 13:44:13 +02:00
Conversation 1 Commits 15 Files Changed 11 +14 -23
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a02e0f46ba - Show all commits

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

@@ -37,10 +37,8 @@ public class XmlController implements RestController {
XMLRequestBody requestBody;
try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
} catch (Exception e) {
XMLResponseBody responseBody = prepareErrorResponseBody(e.getMessage(), "N/A");
response.status(400);
response.body(this.gson.toJson(responseBody));
} catch (Exception ex) {
requestErrorResponse(response, ex);
return;
}
@@ -66,11 +64,8 @@ public class XmlController implements RestController {
XMLRequestBody requestBody;
try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
} catch (Exception e) {
XMLResponseBody responseBody = prepareErrorResponseBody(e.getMessage(), "N/A");
response.status(400);
response.body(this.gson.toJson(responseBody));
} catch (Exception ex) {
requestErrorResponse(response, ex);
return;
}
if (requestBody.getProcessor() == null) {
@@ -89,11 +84,8 @@ public class XmlController implements RestController {
XMLRequestBody requestBody;
try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
} catch (Exception e) {
XMLResponseBody responseBody = prepareErrorResponseBody(e.getMessage(), "N/A");
response.status(400);
response.body(this.gson.toJson(responseBody));
} catch (Exception ex) {
requestErrorResponse(response, ex);
return;
}
@@ -114,10 +106,7 @@ public class XmlController implements RestController {
try {
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
} catch (Exception e) {
XMLResponseBody responseBody = prepareErrorResponseBody(e.getMessage(), "N/A");
response.status(400);
response.body(this.gson.toJson(responseBody));
requestErrorResponse(response, e);
return;
}
@@ -213,8 +202,10 @@ public class XmlController implements RestController {
response.status(400);
}
private void requestErrorResponse(Response response) {
private void requestErrorResponse(Response response, Exception ex) {
XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), "N/A");
response.status(400);
response.body(this.gson.toJson(responseBody));
}
private XMLResponseBody prepareErrorResponseBody(String message, String processor) {

6
Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
View File

@@ -40,7 +40,7 @@ public class Saxon implements XmlEngine{
}
/**
* This method evaluates XQuery exporession on given xml
* This method evaluates XQuery expression on given xml
* @param data xml
* @param xquery expression
* @return
@@ -64,8 +64,8 @@ public class Saxon implements XmlEngine{
/**
* Process xpath and return either node or wrapped atomic value
* @param data xml to be querried
* @param query xpath queryy
* @param data xml to be processed
* @param query xpath query
* @param version processor version
* @return string xml representation of the node
* @throws Exception thrown on node building errors or invalid xpath