javascript 'Set' cannot handle wrapped java objects properly (#1387)

* Set cannot handle wrapped java objects properly * Satisfy spotbugs
mozilla · Oct 6, 2023 · dd9c638 · dd9c638
1 parent d421fe3
commit dd9c638
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 1 deletion.
diff --git a/src/org/mozilla/javascript/NativeJavaArray.java b/src/org/mozilla/javascript/NativeJavaArray.java
@@ -7,6 +7,7 @@
 package org.mozilla.javascript;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 
 /**
  * This class reflects Java arrays into the JavaScript environment.
@@ -143,6 +144,17 @@ public Scriptable getPrototype() {
         return prototype;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return (obj instanceof NativeJavaArray)
+                && Objects.equals(((NativeJavaArray) obj).array, array);
+    }
+
+    @Override
+    public int hashCode() {
+        return array == null ? 0 : array.hashCode();
+    }
+
     Object array;
     int length;
     Class<?> cls;

diff --git a/src/org/mozilla/javascript/NativeJavaClass.java b/src/org/mozilla/javascript/NativeJavaClass.java
@@ -278,4 +278,14 @@ private static Class<?> findNestedClass(Class<?> parentClass, String name) {
     }
 
     private Map<String, FieldAndMethods> staticFieldAndMethods;
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
 }
diff --git a/src/org/mozilla/javascript/NativeJavaList.java b/src/org/mozilla/javascript/NativeJavaList.java
@@ -183,4 +183,14 @@ public Object[] getIds() {
     private boolean isWithValidIndex(int index) {
         return index >= 0 && index < list.size();
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
 }
diff --git a/src/org/mozilla/javascript/NativeJavaMap.java b/src/org/mozilla/javascript/NativeJavaMap.java
@@ -142,6 +142,16 @@ public Object[] getIds() {
         return super.getIds();
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
     private static Callable symbol_iterator =
             (Context cx, Scriptable scope, Scriptable thisObj, Object[] args) -> {
                 if (!(thisObj instanceof NativeJavaMap)) {

diff --git a/src/org/mozilla/javascript/NativeJavaObject.java b/src/org/mozilla/javascript/NativeJavaObject.java
@@ -17,6 +17,7 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * This class reflects non-Array Java objects into the JavaScript environment. It reflect fields
@@ -986,4 +987,16 @@ protected String getTag() {
             }
         }
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj != null
+                && obj.getClass().equals(getClass())
+                && Objects.equals(((NativeJavaObject) obj).javaObject, javaObject);
+    }
+
+    @Override
+    public int hashCode() {
+        return javaObject == null ? 0 : javaObject.hashCode();
+    }
 }
diff --git a/testsrc/jstests/es6/set.js b/testsrc/jstests/es6/set.js
@@ -7,7 +7,7 @@ load("testsrc/assert.js");
 res = "";
 
 function logElement(value, key) {
-    res += "set[" + key + "] (" + this + ") "; 
+    res += "set[" + key + "] (" + this + ") ";
 }
 
 (function TestForEach() {
@@ -81,4 +81,11 @@ function logElement(value, key) {
   }
 })();
 
+(function TestSetAddJavaEnums() {
+  var mySet = new Set();
+  mySet.add(java.nio.file.AccessMode.READ);
+  mySet.add(java.nio.file.AccessMode.READ);
+  assertEquals(1, mySet.size);
+})();
+
 "success";