Added early support for sets

tcalmant · tcalmant · commit 92766e02a416 · 2019-03-15T17:41:53.000+01:00
Supports HashSet and TreeSet. LinkedHashSet is causing too much trouble. See tcalmant#25 for details
diff --git a/javaobj/core.py b/javaobj/core.py
@@ -318,6 +318,13 @@ def __repr__(self):
             name = self.classdesc.name
         return "<javaobj:{0}>".format(name)
 
+    def __hash__(self):
+        """
+        Each JavaObject we load must have a hash method to be accepted in sets
+        and alike. The default hash is the memory address of the object.
+        """
+        return id(self)
+
     def __eq__(self, other):
         """
         Equality test between two Java classes
@@ -1679,12 +1686,39 @@ def __extra_loading__(self, unmarshaller, ident=0):
             if opid != 0:
                 raise ValueError("Should find 0x0, got {0:x}".format(opid))
 
+    class JavaSet(set, JavaObject):
+        """
+        Python-Java set bridge type
+        """
+        def __init__(self, unmarshaller):
+            # type: (JavaObjectUnmarshaller) -> None
+            set.__init__(self)
+            JavaObject.__init__(self)
+
+        def __extra_loading__(self, unmarshaller, ident=0):
+            # type: (JavaObjectUnmarshaller, int) -> None
+            """
+            Loads the content of the map, written with a custom implementation
+            """
+            self.update(self.annotations[1:])
+
+    class JavaTreeSet(JavaSet):
+        def __extra_loading__(self, unmarshaller, ident=0):
+            # type: (JavaObjectUnmarshaller, int) -> None
+            """
+            Loads the content of the map, written with a custom implementation
+            """
+            # Annotation[1] == size of the set
+            self.update(self.annotations[2:])
+
     TYPE_MAPPER = {
         "java.util.ArrayList": JavaList,
         "java.util.LinkedList": JavaList,
         "java.util.HashMap": JavaMap,
         "java.util.LinkedHashMap": JavaLinkedHashMap,
         "java.util.TreeMap": JavaMap,
+        "java.util.HashSet": JavaSet,
+        "java.util.TreeSet": JavaTreeSet,
     }
 
     def create(self, classdesc, unmarshaller=None):
diff --git a/tests/java/src/test/java/OneTest.java b/tests/java/src/test/java/OneTest.java
@@ -6,7 +6,11 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.Vector;
 
 import javax.swing.JScrollPane;
@@ -268,6 +272,39 @@ public void testSuper() throws Exception {
 		oos.flush();
 	}
 
+	@Test
+	public void testHashSet() throws Exception {
+		final Set<Integer> set = new HashSet<Integer>();
+		set.add(1);
+		set.add(2);
+		set.add(1);
+		set.add(42);
+		oos.writeObject(set);
+		oos.flush();
+	}
+
+	@Test
+	public void testLinkedHashSet() throws Exception {
+		final Set<Integer> set = new LinkedHashSet<Integer>();
+		set.add(1);
+		set.add(2);
+		set.add(1);
+		set.add(42);
+		oos.writeObject(set);
+		oos.flush();
+	}
+
+	@Test
+	public void testTreeSet() throws Exception {
+		final Set<Integer> set = new TreeSet<Integer>();
+		set.add(1);
+		set.add(2);
+		set.add(1);
+		set.add(42);
+		oos.writeObject(set);
+		oos.flush();
+	}
+
 	@Test
 	public void testSwingObject() throws Exception {
 
diff --git a/tests/tests.py b/tests/tests.py
@@ -317,6 +317,15 @@ def test_enums(self):
 
             # self._try_marshalling(jobj, pobj)
 
+    def test_sets(self):
+        for filename in ("testHashSet.ser", "testTreeSet.ser"):
+            print("Loading", filename)
+            jobj = self.read_file(filename)
+            pobj = javaobj.loads(jobj)
+            _logger.debug(pobj)
+            self.assertIsInstance(pobj, set)
+            self.assertSetEqual({i.value for i in pobj}, {1, 2, 42})
+
     # def test_exception(self):
     #     jobj = self.read_file("objException.ser")
     #     pobj = javaobj.loads(jobj)
