Merge pull request #49 from node-modules/fix-map-key

fix: HashMap & Map is same type

Author: dead-horse

lib/object.js

@@ -21,7 +21,9 @@ exports.DEFAULT_CLASSNAME = {
   string: 'java.lang.String',
   byteArray: '[B',
   list: 'java.util.ArrayList',
+  // iList: 'java.util.List',
   map: 'java.util.HashMap',
+  iMap: 'java.util.Map',
   exception: 'java.lang.RuntimeException'
 };
 

lib/v1/encoder.js

@@ -327,8 +327,8 @@ proto.writeObject = function (obj) {
     // : {a: 1}
     realObj = obj;
   } else {
-    // : {$class: 'java.utils.HashMap', $: {a: 1}}
-    className = obj.$class === javaObject.DEFAULT_CLASSNAME.map ? '' : obj.$class;
+    // : {$class: 'java.util.HashMap', $: {a: 1}}
+    className = obj.$class === javaObject.DEFAULT_CLASSNAME.map || obj.$class === javaObject.DEFAULT_CLASSNAME.iMap ? '' : obj.$class;
     realObj = obj.$;
   }
 

test/map.test.js

@@ -161,12 +161,35 @@ describe('map.test.js', function () {
     });
   });
 
+  it('should decode successful when key is null', function () {
+    var data = new Buffer([77, 116, 0, 0, 78, 83, 0, 4, 110, 117, 108, 108, 122]);
+    var rv = hessian.decode(data);
+    rv.should.eql({null: 'null'});
+  });
+
   it('should write es6 Map to java.util.Map', function() {
     if (typeof Map !== 'function') {
       // pass if not support es6 Map
       return;
     }
 
+    var map = new Map();
+    map.set({ '$class': 'java.lang.Long', '$': 123 }, 123456);
+    map.set({ '$class': 'java.lang.Long', '$': 123456 }, 123);
+    var buf = hessian.encode({ '$class': 'java.util.Map', '$': map });
+    // decode auto transfer key to string
+    hessian.decode(buf).should.eql({
+      '123': 123456,
+      '123456': 123
+    });
+  });
+
+  it('should write es6 Map to java.util.HashMap', function() {
+    if (typeof Map !== 'function') {
+      // pass if not support es6 Map
+      return;
+    }
+    
     var map = new Map();
     map.set({ '$class': 'java.lang.Long', '$': 123 }, 123456);
     map.set({ '$class': 'java.lang.Long', '$': 123456 }, 123);
@@ -344,37 +367,49 @@ describe('map.test.js', function () {
       });
 
     });
-    
-  });
 
-  it('should decode successful when key is null', function () {
-    var data = new Buffer([77, 116, 0, 0, 78, 83, 0, 4, 110, 117, 108, 108, 122]);
-    var rv = hessian.decode(data);
-    rv.should.eql({null: 'null'});
-  });
+    it('should write es6 Map to java.util.Map', function() {
+      if (typeof Map !== 'function') {
+        // pass if not support es6 Map
+        return;
+      }
+      
+      var map = new Map();
+      map.set({ '$class': 'java.lang.Long', '$': 123 }, 123456);
+      map.set({ '$class': 'java.lang.Long', '$': 123456 }, 123);
+      var buf = hessian.encode({ '$class': 'java.util.Map', '$': map }, '2.0');
+      // decode auto transfer key to string
+      hessian.decode(buf, '2.0').should.eql({
+        '123': 123456,
+        '123456': 123
+      });
+    });
 
-  it('should write es6 Map to java.util.Map', function() {
-    if (typeof Map !== 'function') {
-      // pass if not support es6 Map
-      return;
-    }
+    it('should write es6 Map to java.util.HashMap', function() {
+      if (typeof Map !== 'function') {
+        // pass if not support es6 Map
+        return;
+      }
 
-    var map = new Map();
-    map.set({ '$class': 'java.lang.Long', '$': 123 }, 123456);
-    map.set({ '$class': 'java.lang.Long', '$': 123456 }, 123);
-    var encoder = new hessian.EncoderV2();
-    var buf = encoder.write(map).get();
-    buf.should.eql(utils.bytes('v2/map/generic'));
+      var map = new Map();
+      map.set({ '$class': 'java.lang.Long', '$': 123 }, 123456);
+      map.set({ '$class': 'java.lang.Long', '$': 123456 }, 123);
+      var encoder = new hessian.EncoderV2();
+      var buf = encoder.write(map).get();
+      buf.should.eql(utils.bytes('v2/map/generic'));
 
-    encoder.reset();
+      encoder.reset();
 
-    buf = encoder.write({ '$class': 'java.util.HashMap', '$': map }).get();
-    buf.should.eql(utils.bytes('v2/map/generic'));
+      buf = encoder.write({ '$class': 'java.util.HashMap', '$': map }).get();
+      buf.should.eql(utils.bytes('v2/map/generic'));
 
-    // decode auto transfer key to string
-    hessian.decode(utils.bytes('v2/map/generic'), '2.0').should.eql({
-      '123': 123456,
-      '123456': 123
+      // decode auto transfer key to string
+      hessian.decode(utils.bytes('v2/map/generic'), '2.0').should.eql({
+        '123': 123456,
+        '123456': 123
+      });
     });
+    
   });
+
 });