Refactor template parser

.gitignore

@@ -2,7 +2,15 @@
 /build/
 /.idea/
 /logs/
+out/
+/data
+
 document-service.jar
+**/.DS_Store
+.classpath
+.project
+.settings/
+bin/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -12,5 +20,3 @@ gradle-app.setting
 
 # Cache of project
 .gradletasknamecache
-
-.DS_Store

Dockerfile

@@ -1,25 +1,26 @@
-FROM eu.gcr.io/blockfactory-01/document-service-base
+FROM gradle:jdk8 as build
 
-#font configuration
-COPY ./00-fontconfig.conf /etc/fonts/conf.d/
-
-RUN mkdir /document-service /document-service/fonts /document-service/logs
-
-COPY ./document-service.jar /document-service/
-#COPY ./config.json /document-service/
-COPY ./ui_service /document-service/
-COPY ./run /document-service/
-
-RUN chmod +x /document-service/ui_service
-RUN chmod +x /document-service/run
+COPY --chown=gradle:gradle . /home/gradle/project/
+WORKDIR /home/gradle/project
+RUN gradle clean test buildJar --no-daemon
 
+FROM ubuntu:18.04
+EXPOSE 2115
 ENV LANG="en_US.UTF-8"
 
-WORKDIR /document-service
+## Fix installation of openjdk-8-jre-headless (https://github.com/nextcloud/docker/issues/380)
+RUN mkdir -p /usr/share/man/man1
+RUN apt-get update && apt-get install -y \
+        software-properties-common \
+        language-pack-en-base \
+        openjdk-8-jre-headless \
+        libreoffice \
+    && apt-get clean && rm -rf /var/cache/* /var/lib/apt/lists/*
 
-#document-service
-EXPOSE 2115
-#UI
-EXPOSE 58082
+#font configuration
+COPY ./00-fontconfig.conf /etc/fonts/conf.d/
+
+RUN mkdir /document-service /document-service/fonts /document-service/logs
+COPY --from=build /home/gradle/project/document-service.jar /document-service/
 
-CMD ["./run"]
+CMD ["/usr/bin/java", "-jar", "/document-service/document-service.jar"]

Makefile

@@ -1,11 +1,11 @@
 .PHONY: all build build-docker clean clean-docker
 
-all: build build-docker run-docker
+all: build build-docker
 
 build:
 	gradle buildJar
 build-docker:
-	docker image build -f Dockerfile.dev -t document-service .
+	docker image build -t document-service .
 clean:
 	rm -rf .gradle build document-service.jar
 clean-docker:

README.md

@@ -21,60 +21,53 @@ Currently supported template format is `ODT`. Other formats like `DOCX` are not
 + gradle
 + docker
 
-#### Building for development
+#### Building
+```
+sudo docker build -t document-service .
 ```
- gradle buildJar
- sudo docker image build -f Dockerfile.dev -t document-service .
-
- #run 2115 for the document-service and 58082 for the UI in case it is needed
- sudo docker run -p 2115:2115 -p 58082:58082 document-service
-
- #single cmd
- gradle buildJar && sudo docker image build -t document-service -f ./Dockerfile.dev . && sudo docker run -p 2115:2115 -p 58082:58082 document-service
 
- #for removing all dockers you can run
- sudo ./rmalldockers.sh
+#### Local run for development
+```
+ sudo docker run -p 2115:2115 document-service
 ```
-To run a development environment use this repository: https://git.proxeus.com/docker/proxeus-platform
 
-#### Building for production
+#### Use the official docker hub image from Proxeus
 ```
-gradle buildJar
-sudo docker image build -t document-service -f ./Dockerfile .
+sudo docker run -p 2115:2115 proxeus/document-service:latest
 ```
 
 ## Commandline client
-```
-#compile usage:
-./dsclient -t tmpl.odt -o my.pdf
-./dsclient -u http://123.12.12.111:8888 -f pdf -t my/tmpl.odt -d data.json -a myImage.png -a my/images/dir -o output.pdf 
-#print vars usage:
-./dsclient -m vars -t my/tmpl.odt -p input.
-
-  -a value
-        asset files, provide directory or file like -a file1 -a file2 -a dir1
-  -d string
-        JSON file path
-  -e    embed compilation error into the returned document
-  -f string
-        result format, possible values: pdf, odt, docx or doc (default "pdf")
-  -m string
-        compile or vars (default "compile")
-  -o string
-        output path, extension will be attached if not provided (default "result")
-  -p string
-        var prefix to filter vars
-  -t string
-        ODT template path
-  -u string
-        Document-Service URL (default "http://localhost:2115")
+You can simply interact with the server using `curl`.
+
 
 ```
+# To compile a template to pdf (pdf is the default)
+
+curl --form [email protected] --form [email protected] http://<server>/compile > result.pdf
+
+# To compile a template to odt (available format are pdf, odt, docx or doc) 
+
+curl --form [email protected] --form [email protected] http://<server>/compile?format=odt > result.pdf
 
-## Playground UI
-If you want to get familiar with the Document-Service, you should start the docker with `-p 58082:58082` to expose the UI.
-The UI provides access to the API, documentation and examples. You can play around with all available methods.
-It is recommended to disable the UI under production.
+# To embed the template rendering error in the pdf result (add the `error` query parameter 
+
+curl --form [email protected] --form [email protected] http://<server>/compile?error > result.pdf
+
+# To get the variables used in a template
+
+curl --data-binary @template.odt http://<server>/vars
+curl --form [email protected]  http:/<server>/vars 
+
+# To get the subset of the variable starting with a given prefix 
+
+curl --data-binary @template.odt http://<server>/vars?prefix=foo
+curl --form [email protected]  http:/<server>/vars?prefix=bar 
+
+# To add asset files
+
+curl --form [email protected] --form [email protected] --form [email protected] http://<server>/compile > result.pdf
+
+```
 
 ## API
 The API documentation can be accessed by `<host>:<port>/api` or over the playground UI on the top right corner.

build.gradle

@@ -1,6 +1,8 @@
+/*
 plugins {
-    id "com.github.hierynomus.license" version "0.15.0"
+    id "com.github.hierynomus.license" version "0.15.0j"
 }
+*/
 
 apply plugin: 'groovy'
 apply plugin: 'java'
@@ -9,6 +11,7 @@ version = '1.0'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+
 allprojects {
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) {
@@ -65,7 +68,7 @@ dependencies {
     compile "javax.xml.bind:jaxb-api:2.2.11", ex
     compile "commons-io:commons-io:RELEASE", ex
     compile "javaxt:javaxt-core:1.7.8", ex
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
 
     compile "commons-codec:commons-codec:1.11", ex
     compile "commons-io:commons-io:2.5", ex
@@ -80,5 +83,6 @@ dependencies {
     compile "org.libreoffice:juh:6.2.3", ex
     compile "org.libreoffice:ridl:6.2.3", ex
 
-    testCompile "junit:junit:4.10"
+    testCompile "junit:junit:4.13"
+    testCompile "org.mockito:mockito-core:2.+"
 }