Skip to content

feat(valid): #5 support valid & Null valud #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2015
Merged

feat(valid): #5 support valid & Null valud #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 71 additions & 30 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,30 @@

'use strict';

var combine = function (className, value) {
var combine = function (type, value) {
if (value == null) {
return null;
}
if (typeof type === 'string') {
type = {
name: type,
valid: ignore
};
}
return {
$class: className,
$: value
$class: type.name,
$: type.valid(value)
};
};

var combineArray = function (type, value) {
var values = [];
for (var i = 0, len = value.length; i < len; i++) {
values.push(combine(type, value[i]));
}
return {
$class: '[' + (type.name || type),
$: values
};
};

Expand All @@ -35,32 +55,41 @@ exports.__defineGetter__('combine', function () {
return combine;
});

// valid list
function ignore(val) {return val;}
function bool(val) {return !!bool;}
function integer(val) {return parseInt(val, 10)}
// parseInt;
// parseFloat;
// String

var simpleTypeMap = exports.simpleTypeMap = {
Boolean: 'java.lang.Boolean',
boolean: 'boolean',
Integer: 'java.lang.Integer',
int: 'int',
short: 'short',
Short: 'java.lang.Short',
byte: 'byte',
Byte: 'java.lang.Byte',
long: 'long',
Long: 'java.lang.Long',
double: 'double',
Double: 'java.lang.Double',
float: 'float',
Float: 'java.lang.Float',
String: 'java.lang.String',
char: 'char',
chars: 'char[]',
Character: 'java.lang.Character',
List: 'java.util.List',
Set: 'java.util.Set',
Iterator: 'java.util.Iterator',
Enumeration: 'java.util.Enumeration',
HashMap: 'java.util.HashMap',
Map: 'java.util.Map',
Dictionary: 'java.util.Dictionary'
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},
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},
String: {name: 'java.lang.String', valid: String},
char: {name: 'char', valid: String},
chars: {name: 'char[]', valid: String},
Character: {name: 'java.lang.Character', valid: String},
List: {name: 'java.util.List', valid: ignore},
Set: {name: 'java.util.Set', valid: ignore},
Iterator: {name: 'java.util.Iterator', valid: ignore},
Enumeration: {name: 'java.util.Enumeration', valid: ignore},
HashMap: {name: 'java.util.HashMap', valid: ignore},
Map: {name: 'java.util.Map', valid: ignore},
Dictionary: {name: 'java.util.Dictionary', valid: ignore},
};

/**
Expand Down Expand Up @@ -92,7 +121,7 @@ Object.keys(simpleTypeMap).forEach(function (key) {

exports.array = function (className, val) {
className = simpleTypeMap[className] || className;
return combine('[' + className, val);
return combineArray(className, val);
};

/**
Expand All @@ -106,7 +135,7 @@ exports.array = function (className, val) {

Object.keys(simpleTypeMap).forEach(function (key) {
exports.array[key] = function (val) {
return combine('[' + simpleTypeMap[key], val);
return combineArray(simpleTypeMap[key], val);
};
});

Expand All @@ -120,6 +149,9 @@ 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;
Expand All @@ -134,6 +166,9 @@ exports.abstract = function (abstractClassName, className, val) {
* }
*/
exports.enum = function (className, name) {
if (name == null) {
return null;
}
return combine(className, {
name: name
});
Expand All @@ -148,6 +183,9 @@ exports.enum = function (className, name) {
* }
*/
exports.Class = function (name) {
if (name == null) {
return null;
}
return combine('java.lang.Class', {
name: name
});
Expand All @@ -163,6 +201,9 @@ exports.Class = function (name) {
* }
*/
exports.Locale = function (locale, handle) {
if (locale == null) {
return null;
}
return combine(handle || 'com.caucho.hessian.io.LocaleHandle', {
value: locale
});
Expand Down
49 changes: 39 additions & 10 deletions test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,48 @@ describe('js to java', function () {
});

it('should simple type map work fine', function () {
for (var key in java.simpleTypeMap) {
var val = 1;
java[key](val).should.eql({
$class: java.simpleTypeMap[key],
$: val
});
}
var val = 1;
java.boolean(val).should.eql({$class: 'boolean', $: true});
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.short('101').should.eql({$class: 'short', $: 101});
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('1').should.eql({$class: 'java.lang.Double', $: 1});
java.float('1').should.eql({$class: 'float', $: 1});
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;
});

it('should array work fine', function () {
java.array('Short', 1).should.eql({$class: '[java.lang.Short', $: 1});
java.array('com.java.Object', [{}]).should.eql({$class: '[com.java.Object', $: [{}]});
java.array('Short', [1]).should.eql({$class: '[java.lang.Short', $: [
{
$class: 'java.lang.Short',
$: 1
}
]});
java.array('com.java.Object', [{}]).should.eql({$class: '[com.java.Object', $: [{
$class: 'com.java.Object',
$: {}
}]});
});

it('should array.type work fine', function () {
java.array.Integer([1, 2, 3]).should.eql({$class: '[java.lang.Integer', $: [1, 2, 3]});
java.array.Integer(['1', '2', 3]).should.eql({$class: '[java.lang.Integer', $: [
{ $: 1, $class: 'java.lang.Integer' },
{ $: 2, $class: 'java.lang.Integer' },
{ $: 3, $class: 'java.lang.Integer' }
]});
});

it('should abstractClass work ok', function () {
Expand Down Expand Up @@ -64,13 +90,15 @@ describe('js to java', function () {
$class: 'hessian.demo.Color',
$: {name: 'RED'}
});
(java.enum() === null).should.be.true;
});

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;
});

it('should create Locale with out input `handle`', function () {
Expand All @@ -85,6 +113,7 @@ describe('js to java', function () {
$class: 'test.com.caucho.hessian.io.LocaleHandle',
$: {value: 'zh_CN'}
});
(java.Locale() === null).should.be.true;
});

});