From 2268f8f7418763d0d250555c15bbe67bbc204f27 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Fri, 30 Apr 2021 17:48:00 +0200 Subject: [PATCH] T288 SparkInitializer created. Added package for java classes --- REST_XSLT/pom.xml | 4 ++-- .../src/main/java/r11/mltx/restxslt/Main.java | 7 +++++++ .../mltx/restxslt/SparkInitializer.java} | 21 +++++++++---------- .../processors/NewNamespaceResolver.java | 2 +- .../mltx/restxslt}/processors/Saxon.java | 2 +- .../mltx/restxslt}/processors/Xalan.java | 6 +----- .../processors/XalanNamespaceResolver.java | 2 +- 7 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 REST_XSLT/src/main/java/r11/mltx/restxslt/Main.java rename REST_XSLT/src/main/java/{Main.java => r11/mltx/restxslt/SparkInitializer.java} (94%) rename REST_XSLT/src/main/java/{ => r11/mltx/restxslt}/processors/NewNamespaceResolver.java (97%) rename REST_XSLT/src/main/java/{ => r11/mltx/restxslt}/processors/Saxon.java (98%) rename REST_XSLT/src/main/java/{ => r11/mltx/restxslt}/processors/Xalan.java (95%) rename REST_XSLT/src/main/java/{ => r11/mltx/restxslt}/processors/XalanNamespaceResolver.java (99%) diff --git a/REST_XSLT/pom.xml b/REST_XSLT/pom.xml index a76fe68..4009c56 100644 --- a/REST_XSLT/pom.xml +++ b/REST_XSLT/pom.xml @@ -24,7 +24,7 @@ - + @@ -48,7 +48,7 @@ true lib/ - Main + r11.mltx.restxslt.Main diff --git a/REST_XSLT/src/main/java/r11/mltx/restxslt/Main.java b/REST_XSLT/src/main/java/r11/mltx/restxslt/Main.java new file mode 100644 index 0000000..ab90124 --- /dev/null +++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/Main.java @@ -0,0 +1,7 @@ +package r11.mltx.restxslt; + +public class Main { + public static void main(String[] args) { + SparkInitializer.run(); + } +} diff --git a/REST_XSLT/src/main/java/Main.java b/REST_XSLT/src/main/java/r11/mltx/restxslt/SparkInitializer.java similarity index 94% rename from REST_XSLT/src/main/java/Main.java rename to REST_XSLT/src/main/java/r11/mltx/restxslt/SparkInitializer.java index d5b1a22..8257764 100644 --- a/REST_XSLT/src/main/java/Main.java +++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/SparkInitializer.java @@ -1,14 +1,16 @@ +package r11.mltx.restxslt; + import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import processors.Saxon; -import processors.Xalan; +import r11.mltx.restxslt.processors.Saxon; +import r11.mltx.restxslt.processors.Xalan; import spark.*; import java.util.HashMap; import java.util.Map; -public class Main { - public static void main(String[] args) { +public class SparkInitializer { + public static void run(){ Spark.port(8081); Spark.after((Filter) (request, response) -> { @@ -25,9 +27,8 @@ public class Main { System.out.println("Server is online"); } - static Route procinfoHandler = (Request req, Response resp) -> { + private static Route procinfoHandler = (Request req, Response resp) -> { try { -// req.session().id resp.header("processor", "Saxon " + Saxon.getVersion() + " over s9api"); return Saxon.getVersion(); } catch (Exception ex) { @@ -35,7 +36,7 @@ public class Main { } }; - static Route xsdHandler = (Request req, Response resp) -> { + private static Route xsdHandler = (Request req, Response resp) -> { String body = req.body(); System.out.println("Request: " + body); ObjectMapper mapper = new ObjectMapper(); @@ -72,7 +73,7 @@ public class Main { return resp; }; - static Route xpathHandler = (Request req, Response resp) -> { + private static Route xpathHandler = (Request req, Response resp) -> { String body = req.body(); System.out.println("Request: " + body); @@ -148,7 +149,7 @@ public class Main { } }; - static Route xsltHandler = (Request req, Response resp) -> { + private static Route xsltHandler = (Request req, Response resp) -> { String body = req.body(); ObjectMapper mapper = new ObjectMapper(); Map jsonMap = null; @@ -173,7 +174,6 @@ public class Main { long duration = 0; switch (processor) { case "saxon": -// resp.header("processor", "Saxon " + Saxon.getVersion()); timeStart = System.currentTimeMillis(); try { tmp = Saxon.processXSLT(data, query); @@ -215,6 +215,5 @@ public class Main { } catch (Exception ex) { return ex.getMessage(); } - }; } diff --git a/REST_XSLT/src/main/java/processors/NewNamespaceResolver.java b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/NewNamespaceResolver.java similarity index 97% rename from REST_XSLT/src/main/java/processors/NewNamespaceResolver.java rename to REST_XSLT/src/main/java/r11/mltx/restxslt/processors/NewNamespaceResolver.java index 83f80cf..c675af1 100644 --- a/REST_XSLT/src/main/java/processors/NewNamespaceResolver.java +++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/NewNamespaceResolver.java @@ -1,4 +1,4 @@ -package processors; +package r11.mltx.restxslt.processors; import net.sf.saxon.om.NamespaceBinding; import net.sf.saxon.om.NamespaceMap; diff --git a/REST_XSLT/src/main/java/processors/Saxon.java b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Saxon.java similarity index 98% rename from REST_XSLT/src/main/java/processors/Saxon.java rename to REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Saxon.java index 5f2f83e..5d3d6a8 100644 --- a/REST_XSLT/src/main/java/processors/Saxon.java +++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Saxon.java @@ -1,4 +1,4 @@ -package processors; +package r11.mltx.restxslt.processors; import net.sf.saxon.om.NamespaceMap; import net.sf.saxon.s9api.*; diff --git a/REST_XSLT/src/main/java/processors/Xalan.java b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Xalan.java similarity index 95% rename from REST_XSLT/src/main/java/processors/Xalan.java rename to REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Xalan.java index 0a56e5c..8d17de3 100644 --- a/REST_XSLT/src/main/java/processors/Xalan.java +++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Xalan.java @@ -1,10 +1,8 @@ -package processors; +package r11.mltx.restxslt.processors; -import org.apache.xpath.domapi.XPathEvaluatorImpl; import org.w3c.dom.Document; import javax.xml.XMLConstants; -import javax.xml.namespace.NamespaceContext; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.*; @@ -18,12 +16,10 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; -import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; public class Xalan { diff --git a/REST_XSLT/src/main/java/processors/XalanNamespaceResolver.java b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/XalanNamespaceResolver.java similarity index 99% rename from REST_XSLT/src/main/java/processors/XalanNamespaceResolver.java rename to REST_XSLT/src/main/java/r11/mltx/restxslt/processors/XalanNamespaceResolver.java index 4418087..f19a537 100644 --- a/REST_XSLT/src/main/java/processors/XalanNamespaceResolver.java +++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/XalanNamespaceResolver.java @@ -1,4 +1,4 @@ -package processors; +package r11.mltx.restxslt.processors; import org.w3c.dom.*;