diff --git a/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java b/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java index 7e9efa8..39830df 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java @@ -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) { diff --git a/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java b/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java index 897da0b..9237c2e 100644 --- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java +++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java @@ -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