Updated deps: Jackson, SLF4J, Saxon, Log4J

Organized POM file
Fix headers
2023-01-09 14:08:02 +01:00 · 2023-01-09 11:53:29 +01:00 · 2023-01-04 15:23:36 +01:00 · 2021-05-07 10:43:06 +02:00 · 2021-05-06 17:02:15 +02:00 · 2021-05-06 16:44:10 +02:00
35 changed files with 503 additions and 377 deletions
--- a/REST_XSLT/.classpath
+++ b/REST_XSLT/.classpath
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
--- a/REST_XSLT/.gitignore
+++ b/REST_XSLT/.gitignore
@@ -0,0 +1,9 @@
+target/
+nbactions.xml
+.idea/
+.settings/
+.classpath
+.settings
+.project
+*.iml
+.vscode
--- a/REST_XSLT/.idea/.gitignore
+++ b/REST_XSLT/.idea/.gitignore
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/REST_XSLT/.idea/REST_XSLT.iml
+++ b/REST_XSLT/.idea/REST_XSLT.iml
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
--- a/REST_XSLT/.idea/compiler.xml
+++ b/REST_XSLT/.idea/compiler.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="RestTMP" />
-        <module name="REST_XSLT" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/REST_XSLT/.idea/encodings.xml
+++ b/REST_XSLT/.idea/encodings.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>
--- a/REST_XSLT/.idea/jarRepositories.xml
+++ b/REST_XSLT/.idea/jarRepositories.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>
--- a/REST_XSLT/.idea/misc.xml
+++ b/REST_XSLT/.idea/misc.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
--- a/REST_XSLT/.idea/uiDesigner.xml
+++ b/REST_XSLT/.idea/uiDesigner.xml
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
--- a/REST_XSLT/.idea/vcs.xml
+++ b/REST_XSLT/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
--- a/REST_XSLT/.project
+++ b/REST_XSLT/.project
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>REST_XSLT</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1614706323594</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
--- a/REST_XSLT/.settings/org.eclipse.core.resources.prefs
+++ b/REST_XSLT/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
--- a/REST_XSLT/.settings/org.eclipse.jdt.apt.core.prefs
+++ b/REST_XSLT/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=false
--- a/REST_XSLT/.settings/org.eclipse.jdt.core.prefs
+++ b/REST_XSLT/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
--- a/REST_XSLT/.settings/org.eclipse.m2e.core.prefs
+++ b/REST_XSLT/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
--- a/REST_XSLT/pom.xml
+++ b/REST_XSLT/pom.xml
@@ -12,6 +12,8 @@
        <maven.compiler.source>11</maven.compiler.source>
        <maven.compiler.target>11</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jackson.version>2.14.1</jackson.version>
+        <slf4j.version>2.0.6</slf4j.version>
    </properties>

    <build>
@@ -24,7 +26,7 @@
 <!--                        <manifest>-->
 <!--                            <addClasspath>true</addClasspath>-->
 <!--                            <classpathPrefix>lib/</classpathPrefix>-->
-<!--                            <mainClass>Main</mainClass>-->
+<!--                            <mainClass>r11.mltx.restxslt.Main</mainClass>-->
 <!--                        </manifest>-->
 <!--                    </archive>-->
 <!--                </configuration>-->
@@ -48,7 +50,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>Main</mainClass>
+                            <mainClass>r11.mltx.restxslt.Main</mainClass>
                        </manifest>
                    </archive>
                    <descriptorRefs>
@@ -72,32 +74,30 @@
    </build>

    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.11.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.11.0</version>
-        </dependency>
+        <!--   Spark    -->
        <dependency>
            <groupId>com.sparkjava</groupId>
            <artifactId>spark-core</artifactId>
            <version>2.9.3</version>
        </dependency>
+
+        <!--    JSON    -->
        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.6.2</version>
-            <scope>test</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
        <!--    XSLT    -->
        <dependency>
            <groupId>net.sf.saxon</groupId>
            <artifactId>Saxon-HE</artifactId>
-            <version>10.3</version>
+            <version>11.4</version>
        </dependency>
        <dependency>
            <groupId>xalan</groupId>
@@ -105,30 +105,38 @@
            <version>2.7.2</version>
        </dependency>

+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.0</version>
+            <version>${slf4j.version}</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
-            <version>1.7.0</version>
+            <version>${slf4j.version}</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.0</version>
+            <version>${slf4j.version}</version>
            <scope>runtime</scope>
        </dependency>
+
        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.19.0</version>
        </dependency>
-        <!--    JSON    -->
+
    </dependencies>

 </project>
--- a/REST_XSLT/src/main/java/r11/mltx/restxslt/Main.java
+++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/Main.java
@@ -0,0 +1,15 @@
+package r11.mltx.restxslt;
+
+/**
+ * Application initializer
+ * @author Wojciech Czop
+ */
+public class Main {
+    /**
+     * Initializes the application
+     * @param args
+     */
+    public static void main(String[] args) {
+        SparkInitializer.run();
+    }
+}
--- a/REST_XSLT/src/main/java/r11/mltx/restxslt/SparkInitializer.java
+++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/SparkInitializer.java
@@ -1,14 +1,24 @@
+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) {
+/**
+ * Class contains spark configuration and method initializing spark framework
+ * @author Wojciech Czop
+ */
+public class SparkInitializer {
+    /**
+     * Initializes spark framework
+     */
+    public static void run(){
+//        TODO: Port value as property
        Spark.port(8081);

        Spark.after((Filter) (request, response) -> {
@@ -25,9 +35,11 @@ public class Main {
        System.out.println("Server is online");
    }

-    static Route procinfoHandler = (Request req, Response resp) -> {
+    /**
+     * Handler that returns processor version
+     */
+    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 +47,11 @@ public class Main {
        }
    };

-    static Route xsdHandler = (Request req, Response resp) -> {
+    /**
+     * Handler that returns info if document is valid
+     * Also provides info about request time and processor
+     */
+    private static Route xsdHandler = (Request req, Response resp) -> {
        String body = req.body();
        System.out.println("Request: " + body);
        ObjectMapper mapper = new ObjectMapper();
@@ -72,7 +88,10 @@ public class Main {
        return resp;
    };

-    static Route xpathHandler = (Request req, Response resp) -> {
+    /**
+     * Handler that returns output of xpath query and processor data
+     */
+    private static Route xpathHandler = (Request req, Response resp) -> {

        String body = req.body();
        System.out.println("Request: " + body);
@@ -148,7 +167,10 @@ public class Main {
        }
    };

-    static Route xsltHandler = (Request req, Response resp) -> {
+    /**
+     * Handler that returns outcome of xslt transformation and processor data
+     */
+    private static Route xsltHandler = (Request req, Response resp) -> {
        String body = req.body();
        ObjectMapper mapper = new ObjectMapper();
        Map<String, String> jsonMap = null;
@@ -173,7 +195,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 +236,5 @@ public class Main {
        } catch (Exception ex) {
            return ex.getMessage();
        }
-
    };
 }
--- a/REST_XSLT/src/main/java/r11/mltx/restxslt/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;
@@ -7,29 +7,50 @@ import net.sf.saxon.s9api.XdmNode;

 import java.util.Iterator;

+/**
+ * Handler for saxon namespace scan engine.
+ * All found namespaces are stored within {@link #namespaceMap}
+ * @author Wojciech Czop
+ */
 public class NewNamespaceResolver {

    private NamespaceMap namespaceMap;

+    /**
+     * Initializes {@link #namespaceMap} with namespace values
+     * @param doc dom structure object
+     * @return map of namespaces
+     */
    public NamespaceMap process(XdmNode doc) {
        namespaceMap = NamespaceMap.emptyMap();
        Iterator<XdmNode> it = doc.children().iterator();
-
+//        TODO: remove
        while (it.hasNext()) {
            XdmNode tmp = it.next();
            extractNamespace(tmp);
        }
+//        end
        return namespaceMap;
    }

+    /**
+     * Iterates through {@link #namespaceMap} and declares namespaces in {@link XPathCompiler}
+     * @param compiler compiler used to compile xpath statements
+     */
    public void exportNamespaces(XPathCompiler compiler){
        Iterator<NamespaceBinding> it = namespaceMap.iterator();
+//        TODO: remove
        while(it.hasNext()){
            System.out.println(it.next());
        }
+//        end
        namespaceMap.forEach(namespaceBinding -> compiler.declareNamespace(namespaceBinding.getPrefix(), namespaceBinding.getURI()));
    }

+    /**
+     * Uses recurrency to dive deep dom structure and appends {@link #namespaceMap} with every found namespace
+     * @param node dom structure object
+     */
    private void extractNamespace(XdmNode node) {
        NamespaceMap tmp;
        if ((tmp = node.getUnderlyingNode().getAllNamespaces()) != null) {
@@ -40,6 +61,7 @@ public class NewNamespaceResolver {
            Iterator<XdmNode> it = node.children().iterator();
            while (it.hasNext()) {
                XdmNode rNode = it.next();
+//                TODO: remove
                if(rNode.getUnderlyingNode().getPrefix().isEmpty() && !rNode.getParent().getUnderlyingNode().getPrefix().isEmpty()){

                    System.out.println("prefix missing, parent has "+rNode.getParent().getUnderlyingNode().getPrefix() + ", but child has none");
@@ -47,6 +69,7 @@ public class NewNamespaceResolver {
                    NamespaceMap nsTMP= rNode.getUnderlyingNode().getAllNamespaces();
                    System.out.println();
                }
+//                end
                extractNamespace(rNode);
            }
        }
--- a/REST_XSLT/src/main/java/r11/mltx/restxslt/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.*;
@@ -6,7 +6,19 @@ import javax.xml.transform.stream.StreamSource;
 import java.io.StringReader;
 import java.io.StringWriter;

+/**
+ * Handler for Saxon engine
+ * @author Wojciech Czop
+ */
 public class Saxon {
+
+    /**
+     * Transforms string containing xml document via xslt
+     * @param data xml to be transformed
+     * @param transform xslt
+     * @return transformed xml
+     * @throws SaxonApiException
+     */
    public static String processXSLT(String data, String transform) throws SaxonApiException {
        Processor processor = new Processor(false);
        XsltCompiler compiler = processor.newXsltCompiler();
@@ -21,14 +33,20 @@ public class Saxon {
        return sw.toString();
    }

+    /**
+     * Process xpath and return either node or wrapped atomic value
+     * @param data xml to be querried
+     * @param query xpath queryy
+     * @param version processor version
+     * @return string xml representation of the node
+     * @throws Exception
+     */
    public static String processXPath(String data, String query, String version) throws Exception {
        Processor p = new Processor(false);
        XPathCompiler compiler = p.newXPathCompiler();
        DocumentBuilder builder = p.newDocumentBuilder();
        XdmNode doc = builder.build(new StreamSource(new StringReader(data)));

-//        System.out.println(version);
-
        compiler.setLanguageVersion(version);

        NewNamespaceResolver resolver = new NewNamespaceResolver();
@@ -47,6 +65,10 @@ public class Saxon {

    }

+    /**
+     * Returns version of the processor
+     * @return version of the processor
+     */
    public static String getVersion() {
        return new Processor(false).getSaxonProductVersion();
    }
--- a/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Xalan.java
+++ b/REST_XSLT/src/main/java/r11/mltx/restxslt/processors/Xalan.java
@@ -1,10 +1,9 @@
-package processors;
+package r11.mltx.restxslt.processors;

-import org.apache.xpath.domapi.XPathEvaluatorImpl;
+import net.sf.saxon.s9api.SaxonApiException;
 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,29 +17,33 @@ 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;

+/**
+ * Handler for Xalan engine
+ * @author Wojciech Czop
+ */
 public class Xalan {
-
+    /**
+     * Transforms string containing xml document via xslt
+     * @param data xml to be transformed
+     * @param transform xslt
+     * @return transformed xml
+     * @throws Exception
+     */
    public static String processXSLT(String data, String transform) throws Exception{
        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
        DocumentBuilder builder = factory.newDocumentBuilder();
        Document document = builder.parse(new InputSource(new StringReader(data)));

-
-
        StreamSource stylesource = new StreamSource(new StringReader(transform));
-
-
-
        Transformer transformer = TransformerFactory.newInstance().newTransformer(stylesource);
        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+
        Source source = new DOMSource(document);
        StringWriter sw = new StringWriter();
        Result outputTarget = new StreamResult(sw);
@@ -49,6 +52,15 @@ public class Xalan {
        return sw.toString();
    }

+    /**
+     * Process xpath and return either node or wrapped atomic value
+     * @deprecated
+     * Xalan needs assumption of the outcome, which is not implemented. Therefore method is deprecated
+     * @param data
+     * @param transform
+     * @return
+     * @throws Exception
+     */
    public static String processXPath(String data, String transform) throws Exception{
        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
        DocumentBuilder builder = factory.newDocumentBuilder();
@@ -61,31 +73,30 @@ public class Xalan {
        String result = exp.evaluate(new InputSource(new StringReader(data)));
        return result;
    }
-    

+    /**
+     * Returns version of the processor
+     * @return version of the processor
+     */
    public static String getVersion(){
        return org.apache.xalan.Version.getVersion();
    }

+    /**
+     * Validates string representation of the xml document against xsd schema
+     * @param data xml document
+     * @param xsd xsd schema
+     * @return statement of validity
+     * @throws Exception
+     */
    public static String validate(String data, String xsd) throws Exception{
-
-
        Source dataSource = new StreamSource(new StringReader(data));
        Source xsdSource = new StreamSource(new StringReader(xsd));
        SchemaFactory schemaFactory = SchemaFactory
                .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-//        try {
            Schema schema = schemaFactory.newSchema(xsdSource);
            Validator validator = schema.newValidator();
            validator.validate(dataSource);
-//            System.out.println(dataSource.getSystemId() + " is valid");
            return "XML file is valid";
-//        } catch (SAXException e) {
-//            System.out.println("Invalid: "+e.getMessage());
-//            return "XML file is NOT valid: " + e.getMessage();
-////            System.out.println(dataSource.getSystemId() + " is NOT valid reason:" + e);
-//        } catch (IOException e) {
-//            return "IO error: "+e.getMessage();
-//        }
    }
 }
--- a/REST_XSLT/src/main/java/r11/mltx/restxslt/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.*;

@@ -8,6 +8,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

+/**
+ * Contains methods that scan document for namespaces and store them in map objects.
+ * @deprecated
+ * Class no longer in use. It has been replaced by {@link NewNamespaceResolver}
+ * @author Wojciech Czop
+ */
 public class XalanNamespaceResolver implements NamespaceContext {
    private static final String DEFAULT_NS = "DEFAULT";
    private Map<String, String> prefix2Uri = new HashMap<String, String>();
@@ -84,6 +90,11 @@ public class XalanNamespaceResolver implements NamespaceContext {

    }

+    /**
+     * Stores namespace prefix ass well as its uri in map
+     * @param prefix
+     * @param uri
+     */
    private void putInCache(String prefix, String uri) {
        prefix2Uri.put(prefix, uri);
        uri2Prefix.put(uri, prefix);
--- a/REST_XSLT/target/classes/Main.class
+++ b/REST_XSLT/target/classes/Main.class
--- a/REST_XSLT/target/classes/log4j.properties
+++ b/REST_XSLT/target/classes/log4j.properties
@@ -1,9 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=ERROR, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
--- a/REST_XSLT/target/classes/processors/NewNamespaceResolver.class
+++ b/REST_XSLT/target/classes/processors/NewNamespaceResolver.class
--- a/REST_XSLT/target/classes/processors/Saxon.class
+++ b/REST_XSLT/target/classes/processors/Saxon.class
--- a/REST_XSLT/target/classes/processors/Xalan.class
+++ b/REST_XSLT/target/classes/processors/Xalan.class
--- a/REST_XSLT/target/classes/processors/XalanNamespaceResolver.class
+++ b/REST_XSLT/target/classes/processors/XalanNamespaceResolver.class
--- a/REST_XSLT/target/maven-archiver/pom.properties
+++ b/REST_XSLT/target/maven-archiver/pom.properties
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Feb 01 11:43:32 CET 2021
-groupId=r11.mltx
-artifactId=REST_XSLT
-version=1.0-SNAPSHOT
--- a/REST_XSLT/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/REST_XSLT/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,3 +0,0 @@
-Main.class
-XSLTProcessors.class
-XPathProcessors.class
--- a/REST_XSLT/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/REST_XSLT/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,3 +0,0 @@
-/home/milu/Documents/czopw/Web/REST_XSLT/src/main/java/Main.java
-/home/milu/Documents/czopw/Web/REST_XSLT/src/main/java/XSLTProcessors.java
-/home/milu/Documents/czopw/Web/REST_XSLT/src/main/java/XPathProcessors.java
--- a/REST_XSLT/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/REST_XSLT/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
--- a/REST_XSLT/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/REST_XSLT/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
--- a/openapi.yml
+++ b/openapi.yml
@@ -0,0 +1,279 @@
+swagger: "2.0"
+info:
+  description: "This is a simple API allowing you to perform XSLT and XPath operations <br>
+  Currently we support Xalan and Saxon (libxml2 is in progress) for XSLT and Saxon for XPath"
+  version: "0.3"
+  title: "XML Tools API"
+host: "gordon.zipper.release11.com:8081"
+schemes:
+  - http
+tags:
+- name: "XPath"
+  description: "XPath processing API"
+- name: "XSLT"
+  description: "XSLT processing API"
+- name: "XSD"
+  description: "XSD verification API"
+paths:
+  /xpathpost:
+    post:
+      tags:
+      - "XPath"
+      summary: "Perform XPath transform on XML file"
+      description: ""
+      operationId: "xpath"
+      consumes:
+      - "application/json"
+      produces:
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "request"
+        description: "A transform that is to be performed"
+        required: true
+        schema:
+          $ref: "#/definitions/RequestXPath"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/Response"
+        "400":
+          description: "Invalid status value"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/ResponseError"
+  /xsltpost:
+    post:
+      tags:
+      - "XSLT"
+      summary: "Perform XSLT transform on XML file"
+      description: ""
+      operationId: "xslt"
+      consumes:
+      - "application/json"
+      produces:
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "request"
+        description: "A transform that is to be performed"
+        required: true
+        schema:
+          $ref: "#/definitions/RequestXSLT"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/Response"
+        "400":
+          description: "Invalid status value"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/ResponseError"
+  /xsdpost:
+    post:
+      tags:
+      - "XSD"
+      summary: "Verify XML file using XSD"
+      description: ""
+      operationId: "xsd"
+      consumes:
+      - "application/json"
+      produces:
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "request"
+        description: "A XML that is to be verified"
+        required: true
+        schema:
+          $ref: "#/definitions/RequestXSD"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/XSDResponse"
+        "400":
+          description: "Invalid status value"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/XSDError"
+definitions:
+  RequestXPath:
+    type: "object"
+    properties:
+      data:
+        type: "string"
+        example: "<values>
+                    <value>Test1</value>
+                    <value>Test3</value>
+                  </values>"
+        description: "The XML data to be processed"            
+      process:
+        type: "string"
+        example: "count(//value)"
+        description: "XPath tranform to be executed"
+      processor:
+        type: "string"
+        enum:
+        - "saxon"
+        - "xalan"
+      version:
+        type: "string"
+        enum:
+        - "2.0"
+        - "3.0"
+        - "3.1"
+  RequestXSLT:
+    type: "object"
+    properties:
+      data:
+        type: "string"
+        example: "<values>
+                    <value>Test1</value>
+                    <value>Test3</value>
+                  </values>"
+        description: "The XML data to be processed"            
+      process:
+        type: "string"
+        example: "count(//value)"
+        description: "XSLT tranform to be executed"
+      processor:
+        type: "string"
+        enum:
+        - "saxon"
+        - "xalan"
+      version:
+        type: "string"
+        enum:
+        - "2.0"
+        - "3.0"
+        - "3.1"
+  RequestXSD:
+    type: "object"
+    properties:
+      data:
+        type: "string"
+        example: "<shiporder orderid=\"889923\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">
+  <shipto>
+    <name>Ola Nordmann</name>
+    <address>Langgt 23</address>
+    <city>4000 Stavanger</city>
+    <country>Norway</country>
+  </shipto>
+</shiporder>"
+        description: "The XML data to be processed"            
+      process:
+        type: "string"
+        example: "<shiporder orderid=\"889923\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">
+  <shipto>
+    <name>Ola Nordmann</name>
+    <address>Langgt 23</address>
+    <city>4000 Stavanger</city>
+    <country>Norway</country>
+  </shipto>
+</shiporder>"
+        description: "XSD to perform verification with"
+      processor:
+        type: "string"
+        enum:
+        - "saxon"
+        - "xalan"
+      version:
+        type: "string"
+        enum:
+        - "2.0"
+        - "3.0"
+        - "3.1"
+  Response:
+    type: "object"
+    properties:
+      result:
+        type: "string"
+        example: "4"
+        description: "Result of performing transformation on provided XML"
+      time:
+        type: "string"
+        example: "320"
+        description: "Computation time in milliseconds"
+      processor:
+        type: "string"
+        enum:
+        - "Saxon 10.3 2.0 over s9api"
+        - "Xalan Java 2.7.2"
+      status:
+        type: "string"
+        enum:
+        - "OK"
+  ResponseError:
+    type: "object"
+    properties:
+      result:
+        type: "string"
+        example: "Concatenation operator ('||') requires XPath 3.0 to be enabled"
+        description: "Error from XPath processor"
+      time:
+        type: "string"
+        example: "40"
+        description: "Computation time in milliseconds"
+      processor:
+        type: "string"
+        enum:
+        - "Saxon 10.3 2.0 over s9api"
+        - "Xalan Java 2.7.2"
+      status:
+        type: "string"
+        enum:
+        - "ERR"
+  XSDResponse:
+    type: "object"
+    properties:
+      result:
+        type: "string"
+        example: "XML file is valid"
+        description: "Validation result"
+      time:
+        type: "string"
+        example: "7"
+        description: "Computation time in milliseconds"
+      processor:
+        type: "string"
+        enum:
+        - "Xalan Java 2.7.2"
+      status:
+        type: "string"
+        enum:
+        - "OK"
+  XSDError:
+    type: "object"
+    properties:
+      result:
+        type: "string"
+        example: "The end-tag for element type \"xs:complexType\" must end with a '>' delimiter."
+        description: "Validation result"
+      time:
+        type: "string"
+        example: "7"
+        description: "Computation time in milliseconds"
+      processor:
+        type: "string"
+        enum:
+        - "Xalan Java 2.7.2"
+      status:
+        type: "string"
+        enum:
+        - "ERR"
+
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"
--- a/readme.md
+++ b/readme.md
@@ -0,0 +1,41 @@
+# XML Tools
+Content of this project is a service hosting tools for xml documents including xslt transformer,
+xpath selector and xsd validator.
+
+## About project
+Service is split into two microservices one containing JavaSpark web application and second hosting
+static documents.
+
+## JavaSpark backend
+Backend is hosted by default on port 8081. Rest api documentation is contained in OpenApi document
+openapi.yml
+
+Rest API accepts xml documents, given querry and processor version to call requested xml engine to perform given
+operation and finally returns outcome in response body.
+
+## Frontend
+All the static files are available by default on port 8086 and are located within folder.
+
+To preview given document user is required to post GET request to following path:
+```aidl
+/Frontend/{document name}
+```
+Documents are hosted by docker container running on ngix image and to modify container content
+one must modify Dockerfile located in Frontend folder. Files published must be located in ngix directory
+within created container.
+
+## How to run
+
+### Localy
+In order to run application use
+```aidl
+docker-compose up --build -d
+```
+Which will launch service on localhost.
+
+### Remote
+To launch service on remote host, exchange ssh keys with destination server and declare docker context ex. DEV.
+Then use following command
+```aidl
+docker-compose up --context DEV --build -d 
+```
Author	SHA1	Message	Date
bema	5aea3401a6	Updated deps: Jackson, SLF4J, Saxon, Log4J	2023-01-09 14:08:02 +01:00
bema	463e72c48c	Organized POM file	2023-01-09 11:53:29 +01:00
Wojciech Czop	b3666e21df	Fix headers	2023-01-04 15:23:36 +01:00
Wojciech Czop	98025d763f	T285 Added OpenApi	2021-05-07 10:43:06 +02:00
modzeleg	767051f1ad	T285 added readme file	2021-05-06 17:02:15 +02:00
modzeleg	708cc415d6	T285 removed drafts	2021-05-06 16:44:10 +02:00
modzeleg	4413405b7d	T285 Added Javadoc	2021-05-06 16:11:09 +02:00
modzeleg	7a7834fb06	T285 javadoc added	2021-04-30 18:08:39 +02:00
modzeleg	2268f8f741	T288 SparkInitializer created. Added package for java classes	2021-04-30 17:48:00 +02:00
modzeleg	0b0ed6af98	Added .gitignore to backend	2021-04-30 17:31:14 +02:00