Update java executor and make package

Author: nolanpro

Dockerfile

@@ -4,8 +4,16 @@ MAINTAINER ProcessMaker Inc.
 
 COPY /src /opt/executor
 
-WORKDIR /opt/executor/spark-sdk-java
+WORKDIR /opt/executor
+
+# https://superuser.com/questions/1423486
+RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50
+RUN apt-get update && apt-get install -y git-core
+RUN if [ ! -d "sdk-java" ]; then git clone --depth 1 https://github.com/ProcessMaker/sdk-java.git; fi
+
+WORKDIR /opt/executor/sdk-java
 
-RUN mvn package -DmyProperty=3.9.1
+RUN mvn clean install
 
 WORKDIR /opt/executor

README.md

@@ -1,7 +1,7 @@
-# spark-docker-executor-java
+# docker-executor-java
 Script Task Executor Engine with Java Runtime
 
-This docker image provides a sandboxed protected environment to run custom Java scripts that are written in ProcessMaker Spark.
+This docker image provides a sandboxed protected environment to run custom Java scripts that are written in ProcessMaker 4.
 
 ## How to use
 The execution requires a data.json, config.json and an output.json file be present on the host system. The data.json represents the 
@@ -13,8 +13,9 @@ It is the responsibility of the caller to have these files prepared before execu
 ### Install
 
 ```
-git clone https://github.com/ProcessMaker/spark-docker-executor-java.git
-./build.sh
+git clone https://github.com/ProcessMaker/docker-executor-java.git
+cd docker-executor-java
+docker build -t processmaker4/docker-executor-java .
 ```
 
 ### Example data.json
@@ -54,8 +55,8 @@ public class Script implements BaseScript {
 ```bash
 $ docker run -v <path to local data.json>:/opt/executor/data.json \
   -v <path to local config.json>:/opt/executor/config.json \
-  -v <path to local script.Java>:/opt/executor/script.Java \
+  -v <path to local Script.java>:/opt/executor/Script.java \
   -v <path to local output.json>:/opt/executor/output.json \
-  processmaker/spark-docker-executor-java:dev-master \
+  processmaker4/docker-executor-java \
   /opt/executor/run.sh
 ```

build.sh

@@ -0,0 +1,20 @@
+{
+    "name": "processmaker/docker-executor-java",
+    "friendly_name": "Java Docker Executor",
+    "description": "Java script executor for processmaker 4",
+    "version": "0.0.1",
+    "minimum-stability": "dev",
+    "autoload": {
+        "psr-4": {
+            "ProcessMaker\\Package\\DockerExecutorJava\\": "src",
+            "ProcessMaker\\ScriptRunners\\": "src/ScriptRunners"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "ProcessMaker\\Package\\DockerExecutorJava\\DockerExecutorJavaServiceProvider"
+            ]
+        }
+    }
+}

composer.json

@@ -1,2 +1,2 @@
-spark-sdk-java/
+sdk-java/
 

src/.gitignore

@@ -0,0 +1,48 @@
+<?php
+namespace ProcessMaker\Package\DockerExecutorJava;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
+use ProcessMaker\Traits\PluginServiceProviderTrait;
+use ProcessMaker\Package\Packages\Events\PackageEvent;
+use ProcessMaker\Package\WebEntry\Listeners\PackageListener;
+
+class DockerExecutorJavaServiceProvider extends ServiceProvider
+{
+    use PluginServiceProviderTrait;
+
+    const version = '0.0.1'; // Required for PluginServiceProviderTrait
+
+    public function register()
+    {
+    }
+
+    /**
+     * After all service provider's register methods have been called, your boot method
+     * will be called. You can perform any initialization code that is dependent on
+     * other service providers at this time.  We've included some example behavior
+     * to get you started.
+     *
+     * See: https://laravel.com/docs/5.6/providers#the-boot-method
+     */
+    public function boot()
+    {
+        \Artisan::command('docker-executor-java:install', function () {
+            // nothing to do here
+        });
+        
+        $config = [
+            'name' => 'Java',
+            'runner' => 'JavaRunner',
+            'mime_type' => 'application/java',
+            'image' => env('SCRIPTS_JAVA_IMAGE', 'processmaker4/executor-java'),
+            'options' => ['invokerPackage' => "ProcessMaker_Client"]
+        ];
+        config(['script-runners.java' => $config]);
+
+        $this->app['events']->listen(PackageEvent::class, PackageListener::class);
+
+        // Complete the plugin booting
+        $this->completePluginBoot();
+    }
+}

src/DockerExecutorJavaServiceProvider.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace ProcessMaker\Package\DockerExecutorJava\Listeners;
+
+use Carbon\Carbon;
+use DateTime;
+use ProcessMaker\Package\Packages\Events\PackageEvent;
+
+class PackageListener
+{
+    /**
+     * Gets the attributes from this package and add to event list
+     * The attributes are read them from composer.json file for this package,
+     * The especial attribute "expire_in" is getting from ioncube loader function with timezone of the ProcessMaker server
+     * @param PackageEvent $event
+     * @return mixed
+     */
+    public function handle(PackageEvent $event){
+        $composer = json_decode(file_get_contents(__DIR__ . '/../../composer.json'), true);
+        $expires_on = null;
+        if(in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info())
+            $expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);           
+        
+        $infoPackage = [
+            'name' => $composer['name'],
+            'friendly_name' => isset($composer['friendly_name']) ? $composer['friendly_name'] : '',
+            'description' => $composer['description'],
+            'version' => $composer['version'],
+            'expires_on' => $expires_on
+        ];
+        $event->packages->push($infoPackage);
+        return $event->packages->last();
+    }
+}

src/Listeners/PackageListener.php

@@ -11,11 +11,11 @@ public class Main {
 
     public static void main(String args[]) throws FileNotFoundException {
         Script script = new Script();
-        Map<String, Object> data = Spark.data();
-        Map<String, Object> config = Spark.config();
+        Map<String, Object> data = ProcessMaker.data();
+        Map<String, Object> config = ProcessMaker.config();
         Map<String, Object> output = new HashMap<String, Object>();
-        ApiClient api = Spark.api();
+        ApiClient api = ProcessMaker.api();
         script.execute(data, config, output, api);
-        Spark.printOutput(output);
+        ProcessMaker.printOutput(output);
     }
 }

src/Main.java

@@ -1,4 +1,3 @@
-import org.openapitools.client.api.UsersApi;
 import ProcessMaker_Client.ApiClient;
 import com.google.gson.Gson;
 import java.io.*;
@@ -7,7 +6,7 @@
 import java.util.Map;
 import java.util.HashMap;
 
-public class Spark {
+public class ProcessMaker {
 
     public static ApiClient api() {
         String baseApiUrl = System.getenv("API_HOST");
@@ -42,6 +41,14 @@ public static Map<String, Object> config() throws FileNotFoundException {
 
     public static void printOutput(Map<String, Object> data) {
         String jsonString = new Gson().toJson(data);
-        System.out.println(jsonString);
+
+        // System.out.println(jsonString);
+        try {
+            Writer fileWriter = new FileWriter("output.json", false);
+            fileWriter.write(jsonString);
+            fileWriter.close();
+        } catch(Exception e) {
+            System.out.println(e.getMessage());
+        }
     }
 }

src/Spark.java src/ProcessMaker.javasrc/Spark.java renamed to src/ProcessMaker.java

@@ -0,0 +1,22 @@
+<?php
+
+namespace ProcessMaker\ScriptRunners;
+
+class JavaRunner extends Base
+{
+    /**
+     * Configure docker with java executor
+     *
+     * @param string $code
+     * @param array $dockerConfig
+     *
+     * @return array
+     */
+    public function config($code, array $dockerConfig)
+    {
+        $dockerConfig['image'] = config('script-runners.java.image');
+        $dockerConfig['command'] = '/bin/sh /opt/executor/run.sh';
+        $dockerConfig['inputs']['/opt/executor/Script.java'] = $code;
+        return $dockerConfig;
+    }
+}