fix for bad display of some binary actions

add support for creating java/jar actions

Fixes #961
Fixes #963

Author: starpit

app/content/js/ui.js

@@ -1457,7 +1457,7 @@ const ui = (function() {
                             // show the action's code
                             //
 
-                            if (!entity.exec.binary || !(entity.annotations && entity.annotations.find(({key}) => key === 'binary'))) {
+                            if (!entity.exec.binary && !(entity.annotations && entity.annotations.find(({key}) => key === 'binary'))) {
                                 //
                                 // render the textual source code
                                 //
@@ -1471,6 +1471,7 @@ const ui = (function() {
                                 setTimeout(() => { code.innerText = beautify(entity.exec.kind, entity.exec.code); hljs.highlightBlock(code) }, 100) // HACK HACK to work around highlightjs bug v0.9.12
                             } else {
                                 // TODO what do we do with binary actions?
+                                code.innerText = 'This is a binary action'
                             }
                         }
                     }

app/plugins/ui/commands/openwhisk-core.js

@@ -466,6 +466,7 @@ const addPrettyType = (entityType, verb, entityName) => entity => {
 }
 
 const extensionToKind = {
+    'jar': 'java:default',
     'js': 'nodejs:default',
     'py': 'python:default',
     'swift': 'swift:default'
@@ -531,7 +532,6 @@ specials.actions = {
             }
         }
 
-
         if (options.sequence) {
             options.action.exec = {
                 kind: 'sequence',
@@ -575,7 +575,9 @@ specials.actions = {
             } else {
                 // otherwise, find the file named by argv[0]
                 const filepath = ui.findFile(expandHomeDir(argv[0])),
-                      isBinary = argv[0].endsWith('.zip'),
+                      isZip = argv[0].endsWith('.zip'),
+                      isJar = argv[0].endsWith('.jar'),
+                      isBinary = isZip || isJar,
                       encoding = isBinary ? 'base64' : 'utf8'
 
                 options.action.exec.code = fs.readFileSync(filepath).toString(encoding)
@@ -588,7 +590,7 @@ specials.actions = {
                     options.action.annotations.push({ key: 'wskng.combinators', value: [{
                         type: 'action.kind',
                         role: 'replacement',
-                        badge: 'zip'
+                        badge: isZip ? 'zip' : 'jar'
                     }]})
 
                     options.action.annotations.push({ key: 'binary', value: true })
@@ -618,6 +620,11 @@ specials.actions = {
             // then we must remove options.exec; the backend fails if an empty struct is passed
             delete options.action.exec
         }
+
+        if (options.main && options.action.exec) {
+            // main method of java actions
+            options.action.exec.main = options.main
+        }
     }),
     list: (options, argv) => {
         // support for `wsk action list <packageName>` see shell issue #449

app/plugins/ui/commands/openwhisk-usage.js

@@ -87,6 +87,7 @@ const actionMix = params.concat(annotations).concat(limits).concat([
     { name: '--docker', boolean: true, docs: 'use a dockerhub image for the action' },
     { name: '--native', boolean: true, docs: 'use a shell script or Linux binary for the action' },
     { name: '--web', boolean: true, docs: 'web export the action' },
+    { name: '--main', docs: 'specify the main method for Java actions' },
     { name: '--content-type', hidden: true }
 ])
 

tests/data/jar/README.md

@@ -0,0 +1,14 @@
+The jar file is included in the repo to facilitate the tests, so that
+we don't depend on gradle or some such in the test rig. If you need to
+rebuild the jar, do the following:
+
+
+```sh
+curl -O https://repo1.maven.org/maven2/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar
+javac -target 8 -source 8 echo.java -cp gson-2.6.2.jar
+jar cf echo.jar echo.class
+```
+
+Note that, as of this writing (20180521), the source and target
+versions are important; the currently OpenWhisk does not support any
+more recent bytecode target than 8.

tests/data/jar/echo.jar

@@ -0,0 +1,7 @@
+import com.google.gson.JsonObject;
+
+public class echo {
+    static public JsonObject main(JsonObject args) throws Exception {
+        return args;
+    }
+}

tests/data/jar/echo.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const common = require('../../../lib/common'),
+      openwhisk = require('../../../lib/openwhisk'),
+      ui = require('../../../lib/ui'),
+      assert = require('assert'),
+      keys = ui.keys,
+      cli = ui.cli,
+      sidecar = ui.sidecar,
+      actionName1 = 'foo1'
+
+describe('Create jar actions', function() {
+    before(common.before(this))
+    after(common.after(this))
+
+    it('should have an active repl', () => cli.waitForRepl(this.app))
+
+    it('should create a jar action', () => cli.do(`action create ${actionName1} ./data/jar/echo.jar --main echo`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing(actionName1))
+       .then(sidecar.expectBadge('jar'))
+       .then(app => app.client.getText(`${ui.selectors.SIDECAR_CONTENT} .hook-for-third-party-content`))
+       .then(code => assert.equal(code, 'This is machine-generated code, wrapping around your original code.'))
+       .catch(common.oops(this)))
+
+    it('should invoke the jar action', () => cli.do(`invoke -p x 3`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing(actionName1))
+       .then(sidecar.expectResult({x: 3}))
+       .catch(common.oops(this)))
+})