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 +70 -21
2 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08f8e46650 - Show all commits

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

@@ -49,10 +49,10 @@ public class XmlController implements RestController {
switch (requestBody.getProcessor()) { switch (requestBody.getProcessor()) {
case "saxon": case "saxon":
process(response, requestBody, saxon, XmlJobType.XPath); process(new XmlJob(response, requestBody, saxon, XmlJobType.XPath));
break; break;
case "xalan": case "xalan":
process(response, requestBody, xalan, XmlJobType.XPath); process(new XmlJob(response, requestBody, xalan, XmlJobType.XPath));
break; break;
default: default:
invalidEngineSelectedResponse(response); invalidEngineSelectedResponse(response);
@@ -74,7 +74,7 @@ public class XmlController implements RestController {
} }
if (requestBody.getProcessor().equalsIgnoreCase("saxon")) if (requestBody.getProcessor().equalsIgnoreCase("saxon"))
process(response, requestBody, saxon, XmlJobType.XQuery); process(new XmlJob(response, requestBody, saxon, XmlJobType.XQuery));
else else
invalidEngineSelectedResponse(response); invalidEngineSelectedResponse(response);
} }
@@ -94,7 +94,7 @@ public class XmlController implements RestController {
return; return;
} }
if (requestBody.getProcessor().equalsIgnoreCase("xalan")) if (requestBody.getProcessor().equalsIgnoreCase("xalan"))
process(response, requestBody, xalan, XmlJobType.XSD); process(new XmlJob(response, requestBody, xalan, XmlJobType.XSD));
else else
invalidEngineSelectedResponse(response); invalidEngineSelectedResponse(response);
@@ -117,11 +117,11 @@ public class XmlController implements RestController {
switch (requestBody.getProcessor()) { switch (requestBody.getProcessor()) {
case "saxon": case "saxon":
process(response, requestBody, saxon, XmlJobType.XSLT); process(new XmlJob(response, requestBody, saxon, XmlJobType.XSLT));
return; return;
case "xalan": case "xalan":
process(response, requestBody, xalan, XmlJobType.XSLT); process(new XmlJob(response, requestBody, xalan, XmlJobType.XSLT));
return; return;
default: default:
@@ -129,37 +129,43 @@ public class XmlController implements RestController {
} }
} }
private void process(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) { private void process(XmlJob xmlJob) {
XMLResponseBody responseBody = null; XMLResponseBody responseBody = null;
long timeStart = System.currentTimeMillis(); long timeStart = System.currentTimeMillis();
long duration; long duration;
try { try {
responseBody = selectProcessMethod(response, requestBody, engine, xmlJobType); responseBody = selectProcessMethod(xmlJob);
duration = System.currentTimeMillis() - timeStart; duration = System.currentTimeMillis() - timeStart;
responseBody.setDuration(duration); responseBody.setDuration(duration);
response.status(200); xmlJob.getResponse().status(200);
this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
xmlJob.getEngine().getVersion() +
") processed in " + duration + " ms.");
this.logger.info("Request (" + xmlJobType + ", " + engine.getVersion() + ") processed in " + duration + " ms.");
} catch (Exception ex) { } catch (Exception ex) {
responseBody = processingErrorResponse(response, ex, engine, xmlJobType); responseBody = processingErrorResponse(xmlJob.getResponse(), ex, xmlJob);
} finally { } finally {
response.body(this.gson.toJson(responseBody)); xmlJob.getResponse().body(this.gson.toJson(responseBody));
} }
} }
private XMLResponseBody selectProcessMethod(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) throws Exception { private XMLResponseBody selectProcessMethod(XmlJob xmlJob) throws Exception {
if (xmlJobType == XmlJobType.XPath) if (xmlJob.getXmlJobType() == XmlJobType.XPath)
return processXPath(response, requestBody, engine, xmlJobType); return processXPath(xmlJob);
else else
return processOther(response, requestBody, engine, xmlJobType); return processOther(xmlJob);
} }
private XMLResponseBody processXPath(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) throws Exception { private XMLResponseBody processXPath(XmlJob xmlJob) throws Exception {
XmlEngine engine = xmlJob.getEngine();
XMLRequestBody requestBody = xmlJob.getRequestBody();
XPathQueryResult xPathQueryResult = XPathQueryResult xPathQueryResult =
engine.processXPath(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion()); engine.processXPath(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion());
@@ -170,9 +176,12 @@ public class XmlController implements RestController {
return responseBody; return responseBody;
} }
private XMLResponseBody processOther(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) throws Exception { private XMLResponseBody processOther(XmlJob xmlJob) throws Exception {
XmlEngine engine = xmlJob.getEngine();
XMLRequestBody requestBody = xmlJob.getRequestBody();
String result = null; String result = null;
switch (xmlJobType) { switch (xmlJob.getXmlJobType()) {
case XSLT: case XSLT:
result = engine.processXSLT(requestBody.getData(), requestBody.getProcess()); result = engine.processXSLT(requestBody.getData(), requestBody.getProcess());
break; break;
@@ -185,13 +194,18 @@ public class XmlController implements RestController {
requestBody.getVersion()); requestBody.getVersion());
break; break;
} }
return new XMLResponseBody(result, "OK", engine.getVersion()); return new XMLResponseBody(result, "OK", requestBody.getVersion());
} }
private XMLResponseBody processingErrorResponse(Response response, Exception ex, XmlEngine engine, XmlJobType xmlJobType) { private XMLResponseBody processingErrorResponse(Response response, Exception ex, XmlJob xmlJob) {
XmlEngine engine = xmlJob.getEngine();
XmlJobType xmlJobType = xmlJob.getXmlJobType();
XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), engine.getVersion()); XMLResponseBody responseBody = prepareErrorResponseBody(ex.getMessage(), engine.getVersion());
response.status(400); response.status(400);
this.logger.error("Error on processing " + xmlJobType + " using " + engine.getVersion() + ". " + ex); this.logger.error("Error on processing " + xmlJobType + " using " + engine.getVersion() + ". " + ex);
return responseBody; return responseBody;
} }

35
Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJob.java Normal file
View File

@@ -0,0 +1,35 @@
package com.r11.tools.controller.internal;
import com.r11.tools.model.XMLRequestBody;
import com.r11.tools.xml.XmlEngine;
import spark.Response;
public class XmlJob {
private final Response response;
private final XMLRequestBody requestBody;
private final XmlEngine engine;
private final XmlJobType xmlJobType;
public XmlJob(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
this.response = response;
this.requestBody = requestBody;
this.engine = engine;
this.xmlJobType = xmlJobType;
}
public Response getResponse() {
return response;
}
public XMLRequestBody getRequestBody() {
return requestBody;
}
public XmlEngine getEngine() {
return engine;
}
public XmlJobType getXmlJobType() {
return xmlJobType;
}
}