fix(null): null should target type; modify int type valid

Author: tangyao

index.js

@@ -7,9 +7,6 @@
 'use strict';
 
 var combine = function (type, value) {
-  if (value == null) {
-    return null;
-  }
   if (typeof type === 'string') {
     type = {
       name: type,
@@ -58,27 +55,43 @@ exports.__defineGetter__('combine', function () {
 // valid list
 function ignore(val) {return val;}
 function bool(val) {return !!bool;}
-function integer(val) {return parseInt(val, 10)}
-// parseInt;
-// parseFloat;
-// String
+function baseInt(val) {
+  return val == null ? 0 : integer(val);
+}
+function baseFloat(val) {
+  return val == null ? 0 : float(val);
+}
+function float(val) {
+  if (val == null) {
+    return null;
+  }
+  var r = parseFloat(val);
+  return isNaN(r) ? val : r;
+}
+function integer(val) {
+  if (val == null) {
+    return null;
+  }
+  var r = parseInt(val, 10);
+  return isNaN(r) ? val : r;
+}
 
 var simpleTypeMap = exports.simpleTypeMap = {
   Boolean: {name: 'java.lang.Boolean', valid: bool},
   boolean: {name: 'boolean', valid: bool},
   Integer: {name: 'java.lang.Integer', valid: integer},
-  int: {name: 'int', valid: integer},
-  short: {name: 'short', valid: integer},
+  int: {name: 'int', valid: baseInt},
+  short: {name: 'short', valid: baseInt},
   Short: {name: 'java.lang.Short', valid: integer},
   byte: {name: 'byte', valid: integer},
   Byte: {name: 'java.lang.Byte', valid: integer},
   // long support both string and number
   long: {name: 'long', valid: ignore},
   Long: {name: 'java.lang.Long', valid: ignore},
-  double: {name: 'double', valid: parseFloat},
-  Double: {name: 'java.lang.Double', valid: parseFloat},
-  float: {name: 'float', valid: parseFloat},
-  Float: {name: 'java.lang.Float', valid: parseFloat},
+  double: {name: 'double', valid: baseFloat},
+  Double: {name: 'java.lang.Double', valid: float},
+  float: {name: 'float', valid: baseFloat},
+  Float: {name: 'java.lang.Float', valid: float},
   String: {name: 'java.lang.String', valid: String},
   char: {name: 'char', valid: String},
   chars: {name: 'char[]', valid: String},
@@ -149,9 +162,6 @@ Object.keys(simpleTypeMap).forEach(function (key) {
  */
 
 exports.abstract = function (abstractClassName, className, val) {
-  if (val == null) {
-    return null;
-  }
   var res = combine(className, val);
   res.$abstractClass = abstractClassName;
   return res;
@@ -166,12 +176,10 @@ exports.abstract = function (abstractClassName, className, val) {
  * }
  */
 exports.enum = function (className, name) {
-  if (name == null) {
-    return null;
-  }
-  return combine(className, {
+  var value = name ? {
     name: name
-  });
+  } : null
+  return combine(className, value);
 };
 
 /**
@@ -183,12 +191,10 @@ exports.enum = function (className, name) {
  * }
  */
 exports.Class = function (name) {
-  if (name == null) {
-    return null;
-  }
-  return combine('java.lang.Class', {
+  var value = name ? {
     name: name
-  });
+  } : null;
+  return combine('java.lang.Class', value);
 };
 
 /**
@@ -201,10 +207,8 @@ exports.Class = function (name) {
  * }
  */
 exports.Locale = function (locale, handle) {
-  if (locale == null) {
-    return null;
-  }
-  return combine(handle || 'com.caucho.hessian.io.LocaleHandle', {
+  var value = locale ? {
     value: locale
-  });
+  } : null;
+  return combine(handle || 'com.caucho.hessian.io.LocaleHandle', value);
 };

test/index.test.js

@@ -24,22 +24,29 @@ describe('js to java', function () {
     java.Boolean(val).should.eql({$class: 'java.lang.Boolean', $: true});
     java.Integer('1').should.eql({$class: 'java.lang.Integer', $: 1});
     java.int('1').should.eql({$class: 'int', $: 1});
+    java.int().should.eql({$class: 'int', $: 0});
     java.short('101').should.eql({$class: 'short', $: 101});
+    java.short().should.eql({$class: 'short', $: 0});
+    java.short('str').should.eql({$class: 'short', $: 'str'});
     java.Short('101').should.eql({$class: 'java.lang.Short', $: 101});
     java.byte('1').should.eql({$class: 'byte', $: 1});
     java.Byte('1').should.eql({$class: 'java.lang.Byte', $: 1});
     java.long('1').should.eql({$class: 'long', $: '1'});
     java.Long(1).should.eql({$class: 'java.lang.Long', $: 1});
     java.double('1.02').should.eql({$class: 'double', $: 1.02});
+    java.double().should.eql({$class: 'double', $: 0});
     java.Double('1').should.eql({$class: 'java.lang.Double', $: 1});
     java.float('1').should.eql({$class: 'float', $: 1});
+    java.float().should.eql({$class: 'float', $: 0});
+    java.float('str').should.eql({$class: 'float', $: 'str'});
     java.Float('1.03').should.eql({$class: 'java.lang.Float', $: 1.03});
     java.String(123).should.eql({$class: 'java.lang.String', $: '123'});
     java.char('2').should.eql({$class: 'char', $: '2'});
     java.chars('3').should.eql({$class: 'char[]', $: '3'});
     java.Character(1).should.eql({$class: 'java.lang.Character', $: '1'});
     java.List([]).should.eql({$class: 'java.util.List', $: []});
-    (java.Integer() === null).should.be.true;
+    java.Integer().should.eql({$class: 'java.lang.Integer', $: null});
+    java.Integer('a').should.eql({$class: 'java.lang.Integer', $: 'a'});
   });
 
   it('should array work fine', function () {
@@ -90,15 +97,21 @@ describe('js to java', function () {
       $class: 'hessian.demo.Color',
       $: {name: 'RED'}
     });
-    (java.enum() === null).should.be.true;
+    java.enum('xxx').should.eql({
+      $class: 'xxx',
+      $: null
+    });
   });
 
   it('should create Class', function () {
     java.Class('java.lang.String').should.eql({
       $class: 'java.lang.Class',
       $: {name: 'java.lang.String'}
     });
-    (java.Class() === null).should.be.true;
+    java.Class().should.eql({
+      $class: 'java.lang.Class',
+      $: null
+    });
   });
 
   it('should create Locale with out input `handle`', function () {
@@ -113,7 +126,10 @@ describe('js to java', function () {
       $class: 'test.com.caucho.hessian.io.LocaleHandle',
       $: {value: 'zh_CN'}
     });
-    (java.Locale() === null).should.be.true;
+    java.Locale().should.eql({
+      $class: 'com.caucho.hessian.io.LocaleHandle',
+      $: null
+    });
   });
 
 });