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

Added backend support for multiple files in XSLT. #272

Merged
bema merged 15 commits from widlam/add_multiplefiles_xslt into master 2023-12-04 06:59:06 +01:00
Conversation 7 Commits 15 Files Changed 9 +31 -27
4 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2843d0560a - Show all commits

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

@@ -4,15 +4,11 @@ import com.google.gson.Gson;
import com.r11.tools.controller.internal.*;
import com.r11.tools.model.XMLMultipleFilesBody;
import com.r11.tools.model.XMLResponseBody;
import com.r11.tools.xml.Saxon;
import com.r11.tools.xml.XmlEngine;
import net.sf.saxon.s9api.SaxonApiException;
import org.apache.logging.log4j.Logger;
import spark.Request;
import spark.Response;
import java.io.IOException;
@GlobalControllerManifest
public class MultipleXMLController implements RestController {

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

@@ -2,7 +2,6 @@ package com.r11.tools.controller;
import com.google.gson.Gson;
import com.r11.tools.controller.internal.*;
import com.r11.tools.model.XMLMultipleFilesBody;
import com.r11.tools.model.XMLRequestBody;
bema commented 2023-12-01 13:24:38 +01:00
Outdated
Review
Copy Link

This is unneeded, so should be removed

This is unneeded, so should be removed
import com.r11.tools.model.XMLResponseBody;
import com.r11.tools.model.XPathQueryResult;

2
Backend/tools-services/src/main/java/com/r11/tools/controller/internal/MultipleXmlJob.java
View File

@@ -1,8 +1,6 @@
package com.r11.tools.controller.internal;
import com.r11.tools.model.XMLMultipleFilesBody;
import com.r11.tools.model.XMLRequestBody;
import com.r11.tools.xml.Saxon;
import com.r11.tools.xml.XmlEngine;
bema commented 2023-12-01 13:25:47 +01:00
Review
Copy Link

Unused import, removal needed

Unused import, removal needed
import spark.Response;
bema commented 2023-12-01 13:25:57 +01:00
Review
Copy Link

Same as above

Same as above

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

@@ -24,27 +24,16 @@ public class Saxon implements XmlEngine{
* @param transform XSLT
* @return transformed xml
* @throws SaxonApiException thrown on stylesheet or transformation error
* @throws IOException thrown when file does not exist, or cannot be read.
*/
bema commented 2023-12-01 13:30:54 +01:00
Outdated
Review
Copy Link

I would extract some parts of the code from this method to separate private methods to increase readability

I would extract some parts of the code from this method to separate private methods to increase readability
public String processXSLT(XMLMultipleFilesData[] data, String transform) throws SaxonApiException, IOException{
Processor processor = new Processor(false);
XsltCompiler compiler = processor.newXsltCompiler();
String filesPath = "/tmp/"+UUID.randomUUID()+"/";
try{
Path processPath = Paths.get(filesPath);
Files.createDirectories(processPath);
for (XMLMultipleFilesData fileData : data) {
Path filePath = Files.createFile( Paths.get(filesPath + fileData.getFilename() ) );
try (FileWriter writer = new FileWriter(filePath.toFile())) {
writer.write(fileData.getData());
}
}
Path transformPath = Files.createFile( Paths.get(filesPath + "transform.xsl") );
FileWriter writer = new FileWriter(transformPath.toFile());
writer.write(transform);
writer.close();
createXMLFilesFromData(data, filesPath);
Path transformPath = createXSLTFileAndReturnPath(transform,filesPath);
XsltExecutable stylesheet = compiler.compile( new StreamSource( transformPath.toFile() ));
StringWriter sw = new StringWriter();
@@ -54,17 +43,39 @@ public class Saxon implements XmlEngine{
Xslt30Transformer transformer = stylesheet.load30();
transformer.transform( new StreamSource( new File(filesPath+data[0].getFilename()) ) , out );
return sw.toString();
} finally {
Files
.walk( Paths.get(filesPath) )
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
deleteTemporaryFiles(filesPath);
}
}
private void createXMLFilesFromData( XMLMultipleFilesData[] data , String filesPath ) throws IOException {
Files.createDirectories(Paths.get(filesPath));
for (XMLMultipleFilesData fileData : data) {
Path filePath = Files.createFile( Paths.get(filesPath + fileData.getFilename() ) );
try (FileWriter writer = new FileWriter(filePath.toFile())) {
writer.write(fileData.getData());
}
}
}
private Path createXSLTFileAndReturnPath( String xsltTransform, String filesPath ) throws IOException {
Path transformPath = Files.createFile( Paths.get(filesPath + "transform.xsl") );
FileWriter writer = new FileWriter(transformPath.toFile());
writer.write(xsltTransform);
writer.close();
return transformPath;
}
private void deleteTemporaryFiles(String filesPath) throws IOException {
Files
.walk( Paths.get(filesPath) )
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
}
/**
* Transforms string containing xml document via xslt
* @param data xml to be transformed