Removed duplicate code and adjusted captions #249
@@ -33,16 +33,7 @@ public class XmlController implements RestController {
|
|||||||
this.xalan = xalan;
|
this.xalan = xalan;
|
||||||
}
|
}
|
||||||
|
|
||||||
private XMLResponseBody prepareErrorResponse(String message, String processor) {
|
|
||||||
return new XMLResponseBody(message, "ERR", processor, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void nonValidEngineSelectedResponse(Response response) {
|
|
||||||
XMLResponseBody responseBody =
|
|
||||||
prepareErrorResponse("Valid engines are: saxon, xalan", "N/A");
|
|
||||||
response.body(this.gson.toJson(responseBody));
|
|
||||||
response.status(400);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
|
@ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
|
||||||
public void acceptRequestXPath(Request request, Response response) {
|
public void acceptRequestXPath(Request request, Response response) {
|
||||||
@@ -142,7 +133,66 @@ public class XmlController implements RestController {
|
|||||||
finally {
|
finally {
|
||||||
response.body(this.gson.toJson(responseBody));
|
response.body(this.gson.toJson(responseBody));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ScopedControllerManifest(method = HandlerType.POST, path = "/xsd")
|
||||||
|
public void acceptRequestXsd(Request request, Response response) {
|
||||||
|
XMLRequestBody requestBody;
|
||||||
|
try {
|
||||||
|
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
|
||||||
|
} catch (Exception e) {
|
||||||
|
XMLResponseBody responseBody = prepareErrorResponse(e.getMessage(), "N/A");
|
||||||
|
|
||||||
|
response.status(400);
|
||||||
|
response.body(this.gson.toJson(responseBody));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestBody.getProcessor() == null) {
|
||||||
|
nonValidEngineSelectedResponse(response);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (requestBody.getProcessor().equalsIgnoreCase("xalan"))
|
||||||
|
processXsd(response, requestBody, xalan);
|
||||||
|
else
|
||||||
|
nonValidEngineSelectedResponse(response);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void processXsd(Response response, XMLRequestBody requestBody, XmlEngine engine) {
|
||||||
|
XMLResponseBody responseBody = null;
|
||||||
|
try {
|
||||||
|
long timeStart = System.currentTimeMillis();
|
||||||
|
String result = engine.validate(requestBody.getData(), requestBody.getProcess()).trim();
|
||||||
|
|
||||||
|
response.status(200);
|
||||||
|
|
||||||
|
long duration = System.currentTimeMillis() - timeStart;
|
||||||
|
responseBody = new XMLResponseBody(result, "OK", engine.getVersion(), duration);
|
||||||
|
|
||||||
|
this.logger.info("Request (XSD, " + engine.getVersion() + ") processed in " + duration + " ms.");
|
||||||
|
} catch (Exception ex) {
|
||||||
|
responseBody = prepareErrorResponse(ex.getMessage(), engine.getVersion());
|
||||||
|
response.status(400);
|
||||||
|
|
||||||
|
this.logger.error("Error on validation against XSD using " + engine.getVersion() + ". " + ex);
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
response.body(this.gson.toJson(responseBody));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private XMLResponseBody prepareErrorResponse(String message, String processor) {
|
||||||
|
return new XMLResponseBody(message, "ERR", processor, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void nonValidEngineSelectedResponse(Response response) {
|
||||||
|
XMLResponseBody responseBody =
|
||||||
|
prepareErrorResponse("Valid engines are: saxon, xalan", "N/A");
|
||||||
|
response.body(this.gson.toJson(responseBody));
|
||||||
|
response.status(400);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user