Promisify java class static methods on import.

jimlloyd · jimlloyd · commit d9c25b074632 · 2015-01-14T10:46:00.000-08:00
diff --git a/lib/nodeJavaBridge.js b/lib/nodeJavaBridge.js
@@ -42,6 +42,13 @@ java.import = function(name) {
     }
   }
 
+  var promisify = undefined;
+  var promiseSuffix;
+  if (java.asyncOptions && java.asyncOptions.promisify) {
+    promisify = java.asyncOptions.promisify;
+    promiseSuffix = java.asyncOptions.suffix;
+  }
+
   // copy static methods
   var methods = clazz.getDeclaredMethodsSync();
   for (i = 0; i < methods.length; i++) {
@@ -50,6 +57,9 @@ java.import = function(name) {
       var methodName = methods[i].getNameSync();
       result[methodName + 'Sync'] = java.callStaticMethodSync.bind(java, name, methodName);
       result[methodName] = java.callStaticMethod.bind(java, name, methodName);
+      if (promisify) {
+        result[methodName + promiseSuffix] = promisify(java.callStaticMethod.bind(java, name, methodName));
+      }
     }
   }
 
diff --git a/test/promises-test.js b/test/promises-test.js
@@ -3,8 +3,11 @@ var java = require("../testHelpers").java;
 var nodeunit = require("nodeunit");
 var util = require("util");
 
+
 exports['Promises'] = nodeunit.testCase({
+
   "create an instance of a class and call methods (getClassPromise & getNamePromise)": function(test) {
+    // Adapted from a test in simple-test.js
     java.newInstance("java.util.ArrayList", function(err, list) {
       if (err) {
         console.log(err);
@@ -23,9 +26,24 @@ exports['Promises'] = nodeunit.testCase({
           .then(function() {
             test.expect(2);
             test.done();
-          })
+          });
       }
     });
   },
+
+  "import and execute promisified static method": function (test) {
+    var Test = java.import('Test');
+    Test.staticMethodPromise(99)
+      .then(function (result) {
+        test.equals(100, result);
+      })
+      .catch(function (err) {
+        test.ifError(err);
+      })
+      .then(function() {
+        test.expect(1);
+        test.done();
+      });
+  }
 });
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,13 @@ java.import = function(name) {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ var promisify = undefined;`
	`46`	`+ var promiseSuffix;`
	`47`	`+ if (java.asyncOptions && java.asyncOptions.promisify) {`
	`48`	`+ promisify = java.asyncOptions.promisify;`
	`49`	`+ promiseSuffix = java.asyncOptions.suffix;`
	`50`	`+ }`
	`51`	`+`
`45`	`52`	`// copy static methods`
`46`	`53`	`var methods = clazz.getDeclaredMethodsSync();`
`47`	`54`	`for (i = 0; i < methods.length; i++) {`
`@@ -50,6 +57,9 @@ java.import = function(name) {`
`50`	`57`	`var methodName = methods[i].getNameSync();`
`51`	`58`	`result[methodName + 'Sync'] = java.callStaticMethodSync.bind(java, name, methodName);`
`52`	`59`	`result[methodName] = java.callStaticMethod.bind(java, name, methodName);`
	`60`	`+ if (promisify) {`
	`61`	`+ result[methodName + promiseSuffix] = promisify(java.callStaticMethod.bind(java, name, methodName));`
	`62`	`+ }`
`53`	`63`	`}`
`54`	`64`	`}`
`55`	`65`