[MultiLang #672] Review comments fix: Java script stub generation iss…

…ue fix after migrating to GraalVM RC14
amino-os · Apr 26, 2019 · 5320d36 · 5320d36
1 parent 1f6e71c
commit 5320d36
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/core/src/main/java/amino/run/compiler/GraalStubGenerator.java b/core/src/main/java/amino/run/compiler/GraalStubGenerator.java
@@ -317,7 +317,7 @@ private String generateFunctions() {
         // TODO: this is workaround for the issue:https://github.com/oracle/graal/issues/678.
         // This will be deleted once the above issue is fixed.
         // TODO: For js files, the function "GetMemberKeys" should implement and it should return
-        //  all functions inside the class. Otherwise it will not generate stub class with methods.
+        // all functions inside the class.
         if (lang.equals("js")) {
             Value val = prototype.getMember("GetMemberKeys");
             if (val != null) {
@@ -335,6 +335,10 @@ private String generateFunctions() {
                                     convertFunctionName);
                     res.append(function);
                 }
+            } else {
+                logger.log(
+                        Level.SEVERE,
+                        String.format(" %s.js should have GetMemberKeys function", className));
             }
         }
 

diff --git a/examples/kvstorejs/build.gradle b/examples/kvstorejs/build.gradle
@@ -23,12 +23,7 @@ task runjsapp(type: Exec) {
             "${project.projectDir}/src/main/js/amino/run/appdemo/KeyValueStoreClient.js"
 }
 
-// TODO: Re-enable runapp as soon as https://github.com/oracle/graal/issues/678 has been fixed.
-//       The above bug in graal means that our graalStubGenerator does not correctly generate java
-//       stubs for javascript microservices (the methods in the javascript object are missing).
-// TODO: currently we implemented "GetMemberKeys" method in each JS file which will return all functions in that class.This will remove once the above issue closed.
-
-// Customise task to run Java app
+// Customise task to un Java app
 runapp {
     environment  OMS_IP: "${project.property('omsIp')}"
     environment  OMS_PORT: "${project.property('omsPort')}"

diff --git a/examples/kvstorejs/src/main/js/amino/run/appdemo/KeyValueStore.js b/examples/kvstorejs/src/main/js/amino/run/appdemo/KeyValueStore.js
@@ -34,12 +34,15 @@ class KeyValueStore {
         return this.map.has(key);
     }
 
-    //TODO: this is workaround for the issue:https://github.com/oracle/graal/issues/678. This will be deleted once the above issue is fixed.
+    //TODO: This is workaround for the issue: https://github.com/oracle/graal/issues/678.
+    //This will be deleted once the above issue is fixed.
+    //It will return all functions in this class except constructor.
     GetMemberKeys() {
         let obj = new KeyValueStore();
         let methods = [];
         while (obj = Reflect.getPrototypeOf(obj)) {
-            if ((Object.getPrototypeOf(obj)) && obj != Object.prototype) {
+             //the below condition is used to avoid 'Object' functions like "toString,isPrototypeOf,propertyIsEnumerable,toLocaleString" etc
+            if (obj != Object.prototype) {
                  let keys = Reflect.ownKeys(obj)
                  keys.forEach((k) => {
                      if (k !== "constructor") {