joeferner · joeferner · May 21, 2025 · May 21, 2025
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/devcontainers/javascript-node:22
 
 RUN apt-get update
-RUN apt-get install -y openjdk-17-jdk gdb clang-format
+RUN apt-get install -y openjdk-17-jdk maven gdb clang-format
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,7 @@
         "clazzclazz",
         "Ferner",
         "jarray",
+        "javac",
         "jboolean",
         "jbyte",
         "jchar",

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Notes:
 
 * node-gyp requires python 2.x not python 3.x. See https://github.com/TooTallNate/node-gyp/issues/155 for more details.
 * If you see an error such as "Call to 'node findJavaHome.js' returned exit status 1"
-      Try running `node findJavaHome.js` in the node-java directory to see the full failure message.
+      Try running `node ./scripts/findJavaHome.js` in the node-java directory to see the full failure message.
 * If you are having problems finding 'jni.h'. Make sure you have the JDK installed not just the JRE. If you are using
       OpenJDK you want the openjdk-7-jdk package, not openjdk-7-jre.  _Mavericks users see [Issue #86](https://github.com/nearinfinity/node-java/issues/86) if you run into this._
 
@@ -62,7 +62,7 @@ GYP_DEFINES="armv7=0" CCFLAGS='-march=armv6' CXXFLAGS='-march=armv6' npm install
 ## Manual compile (Using node-gyp)
 
 ```bash
-./compile-java-code.sh
+./scripts/compile-java.sh
 node-gyp configure build
 npm test
 ```
@@ -104,19 +104,6 @@ Then run
 node test.js
 ```
 
-### Java 1.8 support
-
-Manual compilation for Java 1.8 support requires additional steps:
-
-```bash
-./compile-java-code.sh
-./compile-java8-code.sh
-node-gyp configure build
-npm test
-```
-
-Java 1.8 language features can be used in Java classes only if a Java 1.8 JRE is available. The script compile-java8-code.sh is used only to compile java classes used in the 'test8' unit tests, but these classes are checked into the test8/ directory. Note that unit tests in the test8/ directory will pass (by design) if run against a Java 1.7 JRE, provided that a java.lang.UnsupportedClassVersionError is caught with the message 'Unsupported major.minor version 52.0' (the expected behavior when Java 1.8 language features are used in an older JRE).
-
 ## Installation node-webkit
 
 ```bash
@@ -898,7 +885,7 @@ var value = Test.NestedEnum.name_alt;  // OK
 
 ## Error: Cannot find module '../build/jvm_dll_path.json'
 
-Either `postInstall.js` didn't run or there was a problem detecting java. Try running `postInstall.js` manually.
+Either `./scripts/postInstall.js` didn't run or there was a problem detecting java. Try running `./scripts/postInstall.js` manually.
 
 ## Debugging
 

diff --git a/binding.gyp b/binding.gyp
@@ -13,13 +13,13 @@
         'target_arch': 's390'
       }],
       ['OS=="win"', {
-        'javahome%': '<!(node findJavaHome.js)'
+        'javahome%': '<!(node ./scripts/findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
-        'javahome%': '<!(node findJavaHome.js)'
+        'javahome%': '<!(node ./scripts/findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
-        'javalibdir%': "<!(./find_java_libdir.sh <(target_arch) <(OS))"
+        'javalibdir%': "<!(./scripts/find_java_libdir.sh <(target_arch) <(OS))"
       }],
       ['OS=="zos"', {
         'nodever%': '<!(node -e "console.log(process.versions.node)" | cut -d"." -f1)'
@@ -30,12 +30,12 @@
     {
       'target_name': 'nodejavabridge_bindings',
       'sources': [
-        'src/java.cpp',
-        'src/javaObject.cpp',
-        'src/javaScope.cpp',
-        'src/methodCallBaton.cpp',
-        'src/nodeJavaBridge.cpp',
-        'src/utils.cpp'
+        'src-cpp/java.cpp',
+        'src-cpp/javaObject.cpp',
+        'src-cpp/javaScope.cpp',
+        'src-cpp/methodCallBaton.cpp',
+        'src-cpp/nodeJavaBridge.cpp',
+        'src-cpp/utils.cpp'
       ],
       'include_dirs': [
         '<(javahome)/include',

diff --git a/compile-java.sh b/compile-java.sh
diff --git a/index.js b/index.js
@@ -1 +1 @@
-module.exports = require("./lib/nodeJavaBridge");
+module.exports = require("./src-node/nodeJavaBridge");
diff --git a/jarjar.rule b/jarjar.rule
diff --git a/package.json b/package.json
@@ -43,11 +43,12 @@
   },
   "scripts": {
     "install": "node-gyp rebuild",
-    "test": "node testRunner.js",
-    "postinstall": "node postInstall.js",
+    "clean": "rm -rf build",
+    "test": "node ./scripts/testRunner.js",
+    "postinstall": "node ./scripts/postInstall.js",
     "lint": "eslint --ext js,ts,tsx --report-unused-disable-directives --max-warnings 0 .",
     "format": "prettier --write .",
-    "format-cpp": "clang-format --version; find src/ -iname '*.h' -o -iname '*.cpp' | xargs clang-format -i",
+    "format-cpp": "clang-format --version; find src-cpp/ -iname '*.h' -o -iname '*.cpp' | xargs clang-format -i",
     "precommit": "npm run format-cpp && npm run format && npm run lint && npm test"
   },
   "main": "./index.js"

diff --git a/scripts/compile-java.sh b/scripts/compile-java.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -eu
+
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
+if [ -z "${JAVA_HOME:-}" ] && [ -e "/usr/libexec/java_home" ]; then
+    export JAVA_HOME=$(/usr/libexec/java_home -v 11)
+fi
+
+echo "Using $(javac -version)."
+set -x
+
+javac -source 1.8 -target 1.8 src-java/node/*.java
+javac -source 1.8 -target 1.8 test/*.java
+javac -classpath src-java -h ./src-cpp src-java/node/NodeDynamicProxyClass.java
+echo "complete!"
diff --git a/findJavaHome.js → scripts/findJavaHome.js b/findJavaHome.js → scripts/findJavaHome.js
diff --git a/find_java_libdir.sh → scripts/find_java_libdir.sh b/find_java_libdir.sh → scripts/find_java_libdir.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-
 set -eu
 
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
 error() {
   echo "error: $*" >&2
   exit 1
@@ -12,7 +14,7 @@ main () {
   local os=$2
 
   local java_home full_java_version java_version
-  java_home=$(node findJavaHome.js)
+  java_home=$(node ./scripts/findJavaHome.js)
   full_java_version=$(${java_home}/bin/java -version 2>&1 | grep version | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
 
   if [[ "${full_java_version}" = "1."* ]]

diff --git a/postInstall.js → scripts/postInstall.js b/postInstall.js → scripts/postInstall.js
@@ -17,7 +17,7 @@ require("find-java-home")((err, home) => {
     const binary = dll ?? dylib ?? so;
 
     fs.writeFileSync(
-      path.resolve(__dirname, "./build/jvm_dll_path.json"),
+      path.resolve(__dirname, "../build/jvm_dll_path.json"),
       binary ? JSON.stringify(path.delimiter + path.dirname(path.resolve(home, binary))) : '""'
     );
   }

diff --git a/testRunner.js → scripts/testRunner.js b/testRunner.js → scripts/testRunner.js
@@ -10,7 +10,7 @@ const glob = require("glob");
 const path = require("node:path");
 
 const tests = glob
-  .sync(path.join("testAsyncOptions", "*.test.js"))
+  .sync("*.test.js", { cwd: path.join(__dirname, "..", "testAsyncOptions") })
   .sort((a, b) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase()));
 
 tests.unshift("test"); // Arrange to run the primary tests first, in a single process
@@ -19,7 +19,7 @@ function runTest(testArgs, done) {
   const vitest = path.join("node_modules", ".bin", "vitest");
   const cmd = testArgs === "test" ? `vitest --dir test` : `${vitest} ${testArgs}`;
   console.log(`running "${cmd}"...`);
-  childProcess.exec(cmd, function (error, stdout, stderr) {
+  childProcess.exec(cmd, (error, stdout, stderr) => {
     const errText = stderr.toString();
     if (errText !== "") {
       console.error(chalk.bold.red(errText));
@@ -30,7 +30,8 @@ function runTest(testArgs, done) {
   });
 }
 
-async.eachSeries(tests, runTest, function (err) {
+console.log('test to run', tests);
+async.eachSeries(tests, runTest, (err) => {
   if (err) {
     console.error(chalk.bold.red(err));
     process.exit(1);

diff --git a/scripts/update-commons-lang.sh b/scripts/update-commons-lang.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -eu
+
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
+if [ -d build/commons-lang ]; then
+  cd build/commons-lang
+  git pull
+else
+  mkdir -p build
+  cd build
+  git clone --depth 1 git@github.com:apache/commons-lang.git
+  cd commons-lang
+fi
+
+mvn clean compile package -DskipTests
+java -jar ../../src-java/jarjar-1.4.jar process ../../src-java/commons-lang.jarjar.rules target/commons-lang3*-SNAPSHOT.jar ../../src-java/commons-lang3-node-java.jar
+
+echo "complete!"
diff --git a/src/java.cpp → src-cpp/java.cpp b/src/java.cpp → src-cpp/java.cpp
diff --git a/src/java.h → src-cpp/java.h b/src/java.h → src-cpp/java.h
diff --git a/src/javaObject.cpp → src-cpp/javaObject.cpp b/src/javaObject.cpp → src-cpp/javaObject.cpp
diff --git a/src/javaObject.h → src-cpp/javaObject.h b/src/javaObject.h → src-cpp/javaObject.h
diff --git a/src/javaScope.cpp → src-cpp/javaScope.cpp b/src/javaScope.cpp → src-cpp/javaScope.cpp
diff --git a/src/javaScope.h → src-cpp/javaScope.h b/src/javaScope.h → src-cpp/javaScope.h
diff --git a/src/methodCallBaton.cpp → src-cpp/methodCallBaton.cpp b/src/methodCallBaton.cpp → src-cpp/methodCallBaton.cpp
diff --git a/src/methodCallBaton.h → src-cpp/methodCallBaton.h b/src/methodCallBaton.h → src-cpp/methodCallBaton.h
diff --git a/src/nodeJavaBridge.cpp → src-cpp/nodeJavaBridge.cpp b/src/nodeJavaBridge.cpp → src-cpp/nodeJavaBridge.cpp
diff --git a/src/node_NodeDynamicProxyClass.h → src-cpp/node_NodeDynamicProxyClass.h b/src/node_NodeDynamicProxyClass.h → src-cpp/node_NodeDynamicProxyClass.h
diff --git a/src/utils.cpp → src-cpp/utils.cpp b/src/utils.cpp → src-cpp/utils.cpp
diff --git a/src/utils.h → src-cpp/utils.h b/src/utils.h → src-cpp/utils.h
diff --git a/commons-lang.jarjar.rules → src-java/commons-lang.jarjar.rules b/commons-lang.jarjar.rules → src-java/commons-lang.jarjar.rules
diff --git a/commons-lang3-node-java.jar → src-java/commons-lang3-node-java.jar b/commons-lang3-node-java.jar → src-java/commons-lang3-node-java.jar
diff --git a/jarjar-1.4.jar → src-java/jarjar-1.4.jar b/jarjar-1.4.jar → src-java/jarjar-1.4.jar
diff --git a/src-java/node/CastingUtils.class b/src-java/node/CastingUtils.class
diff --git a/src-java/node/MethodCallBaton.class b/src-java/node/MethodCallBaton.class
diff --git a/src-java/node/NodeDynamicProxyClass.class b/src-java/node/NodeDynamicProxyClass.class
diff --git a/src-java/node/NodeJsException.class b/src-java/node/NodeJsException.class
diff --git a/src-java/node/VarArgs.class b/src-java/node/VarArgs.class
diff --git a/lib/nodeJavaBridge.js → src-node/nodeJavaBridge.js b/lib/nodeJavaBridge.js → src-node/nodeJavaBridge.js
@@ -20,7 +20,7 @@ if (!binaryPath) {
 const bindings = require(binaryPath);
 
 const java = (module.exports = new bindings.Java());
-java.classpath.push(path.resolve(__dirname, "../commons-lang3-node-java.jar"));
+java.classpath.push(path.resolve(__dirname, "../src-java/commons-lang3-node-java.jar"));
 java.classpath.push(path.resolve(__dirname, __dirname, "../src-java"));
 java.classpath.pushDir = function (dir) {
   fs.readdirSync(dir).forEach(function (file) {

diff --git a/test/ListenerInterface.class b/test/ListenerInterface.class
diff --git a/test/ListenerTester.class b/test/ListenerTester.class
diff --git a/test/RunInterface$1.class b/test/RunInterface$1.class
diff --git a/test/RunInterface$Interface0Arg.class b/test/RunInterface$Interface0Arg.class
diff --git a/test/RunInterface$Interface1Arg.class b/test/RunInterface$Interface1Arg.class
diff --git a/test/RunInterface$InterfaceWithReturn.class b/test/RunInterface$InterfaceWithReturn.class
diff --git a/test/RunInterface.class b/test/RunInterface.class
diff --git a/test/Test$Enum.class b/test/Test$Enum.class
diff --git a/test/Test$StaticEnum.class b/test/Test$StaticEnum.class
diff --git a/test/Test$SubClass.class b/test/Test$SubClass.class
diff --git a/test/Test$SuperClass.class b/test/Test$SuperClass.class
diff --git a/test/Test.class b/test/Test.class
diff --git a/test/TestExceptions.class b/test/TestExceptions.class
diff --git a/test/TestLambda$IntegerMath.class b/test/TestLambda$IntegerMath.class
diff --git a/test/TestLambda.class b/test/TestLambda.class
diff --git a/testAsyncOptions/allThreeSuffix.test.js b/testAsyncOptions/allThreeSuffix.test.js
@@ -26,7 +26,7 @@ describe("allThreeSuffix", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -54,7 +54,7 @@ describe("allThreeSuffix", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testAsyncOptions/asyncSuffixSyncDefault.test.js b/testAsyncOptions/asyncSuffixSyncDefault.test.js
@@ -47,7 +47,7 @@ describe("asyncSuffixSyncDefault", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -75,7 +75,7 @@ describe("asyncSuffixSyncDefault", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.format("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testAsyncOptions/defacto.test.js b/testAsyncOptions/defacto.test.js
@@ -54,7 +54,7 @@ describe("defacto", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -82,7 +82,7 @@ describe("defacto", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testAsyncOptions/defactoPlusPromise.test.js b/testAsyncOptions/defactoPlusPromise.test.js
@@ -49,7 +49,7 @@ describe("defactoPlusPromise", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -77,7 +77,7 @@ describe("defactoPlusPromise", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testAsyncOptions/default.test.js b/testAsyncOptions/default.test.js
@@ -19,7 +19,7 @@ describe("default", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -47,7 +47,7 @@ describe("default", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testAsyncOptions/noAsync.test.js b/testAsyncOptions/noAsync.test.js
@@ -58,7 +58,7 @@ describe("noAsync", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -86,7 +86,7 @@ describe("noAsync", () => {
   });
 
   test("sStaticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testAsyncOptions/syncDefaultPlusPromise.test.js b/testAsyncOptions/syncDefaultPlusPromise.test.js
@@ -23,7 +23,7 @@ describe("syncDefaultPlusPromise", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // This test verifies the import runs without error.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
@@ -52,7 +52,7 @@ describe("syncDefaultPlusPromise", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.format("%s--%s", "hello", "world")).toBe("hello--world");

diff --git a/testHelpers.js b/testHelpers.js
@@ -4,7 +4,6 @@ java.options.push("-Djava.awt.headless=true");
 
 java.classpath.push("test/");
 java.classpath.push("test/commons-lang3-3.1.jar");
-java.classpath.push("test8/");
 
 export function getJava(asyncOptions) {
   java.asyncOptions = asyncOptions ?? {

diff --git a/update-commons-lang.sh b/update-commons-lang.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = require("./lib/nodeJavaBridge");
		module.exports = require("./src-node/nodeJavaBridge");