@@ -24,15 +24,15 @@ Examples:
2424
2525[source,java]
2626----
27- boolean[] boolArray = new boolean[]{true,false,true};
28- JSONArray jsonArray = JSONArray.fromObject( boolArray );
27+ var boolArray = new boolean[]{true,false,true};
28+ var jsonArray = JSONArray.fromObject( boolArray );
2929System.out.println( jsonArray );
3030// prints [true,false,true]
3131----
3232
3333[source,java]
3434----
35- List list = new ArrayList();
35+ var list = new ArrayList<String> ();
3636list.add( "first" );
3737list.add( "second" );
3838JSONArray jsonArray = JSONArray.fromObject( list );
@@ -58,7 +58,7 @@ Examples:
5858
5959[source,java]
6060----
61- Map map = new HashMap();
61+ var map = new HashMap<String, Object> ();
6262map.put( "name", "json" );
6363map.put( "bool", Boolean.TRUE );
6464map.put( "int", new Integer(1) );
@@ -83,7 +83,7 @@ class MyBean{
8383...
8484}
8585
86- JSONObject jsonObject = JSONObject.fromObject( new MyBean() );
86+ var jsonObject = JSONObject.fromObject( new MyBean() );
8787System.out.println( jsonObject );
8888/* prints
8989 {"name":"json","pojoId":1,"options":["a","f"],
@@ -105,24 +105,24 @@ Convert to DynaBean:
105105
106106[source,java]
107107----
108- String json = "{name=\"json\",bool:true,int:1,double:2.2,func:function(a){ return a; },array:[1,2]}";
109- JSONObject jsonObject = JSONObject.fromObject( json );
110- Object bean = JSONObject.toBean( jsonObject );
108+ var json = "{name=\"json\",bool:true,int:1,double:2.2,func:function(a){ return a; },array:[1,2]}";
109+ var jsonObject = JSONObject.fromObject( json );
110+ var bean = JSONObject.toBean( jsonObject );
111111assertEquals( jsonObject.get( "name" ), PropertyUtils.getProperty( bean, "name" ) );
112112assertEquals( jsonObject.get( "bool" ), PropertyUtils.getProperty( bean, "bool" ) );
113113assertEquals( jsonObject.get( "int" ), PropertyUtils.getProperty( bean, "int" ) );
114114assertEquals( jsonObject.get( "double" ), PropertyUtils.getProperty( bean, "double" ) );
115115assertEquals( jsonObject.get( "func" ), PropertyUtils.getProperty( bean, "func" ) );
116- List expected = JSONArray.toList( jsonObject.getJSONArray( "array" ) );
116+ var expected = JSONArray.toList( jsonObject.getJSONArray( "array" ) );
117117Assertions.assertListEquals( expected, (List) PropertyUtils.getProperty( bean, "array" ) );
118118----
119119
120120Convert to Bean:
121121[source,java]
122122----
123- String json = "{bool:true,integer:1,string:\"json\"}";
124- JSONObject jsonObject = JSONObject.fromObject( json );
125- BeanA bean = (BeanA) JSONObject.toBean( jsonObject, BeanA.class );
123+ var json = "{bool:true,integer:1,string:\"json\"}";
124+ var jsonObject = JSONObject.fromObject( json );
125+ var bean = (BeanA) JSONObject.toBean( jsonObject, BeanA.class );
126126assertEquals( jsonObject.get( "bool" ), Boolean.valueOf( bean.isBool() ) );
127127assertEquals( jsonObject.get( "integer" ), new Integer( bean.getInteger() ) );
128128assertEquals( jsonObject.get( "string" ), bean.getString() );
@@ -152,7 +152,7 @@ Example:
152152[source,java]
153153----
154154class MyBean{
155- private List data;
155+ private List<Person> data;
156156 // getters, setters
157157}
158158
@@ -163,8 +163,8 @@ class Person{
163163
164164...
165165
166- String json = "{'data':[{'name':'Wallace'},{'name':'Grommit'}]}";
167- Map classMap = new HashMap();
166+ var json = "{'data':[{'name':'Wallace'},{'name':'Grommit'}]}";
167+ var classMap = new HashMap<String, Class<?>> ();
168168classMap.put( "data", Person.class );
169169MyBean bean = JSONObject.toBean( JSONObject.fromObject(json), MyBean.class, classMap );
170170----
@@ -176,9 +176,9 @@ Example:
176176
177177[source,java]
178178----
179- Morpher dynaMorpher = new BeanMorpher( Person.class, JSONUtils.getMorpherRegistry() );
179+ var dynaMorpher = new BeanMorpher( Person.class, JSONUtils.getMorpherRegistry() );
180180morpherRegistry.registerMorpher( dynaMorpher );
181- List output = new ArrayList();
181+ var output = new ArrayList<Person> ();
182182for( Iterator i = bean.getData().iterator(); i.hasNext(); ){
183183 output.add( morpherRegistry.morph( Person.class, i.next() ) );
184184}
0 commit comments