Skip to content

Commit d7e990b

Browse files
committed
README updated additional tests added for freemarker and Ognl
1 parent 84a74e6 commit d7e990b

File tree

5 files changed

+579
-22
lines changed

5 files changed

+579
-22
lines changed

README.md

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
#This JSON library for java, is a fork from
22
#Original [package org.json] Douglas Crockford
33

4+
##Version 20121208
5+
I finally made these changes, no reason for not having done before.
6+
* JSONObject implements Map
7+
* JSONArray implements List
8+
* Added separate tests for Ognl and Freemarker. Yet to include them in regression test.
9+
10+
##Version 20121205
411
The key changes are:
512
##JSONObject is extended from LinkedHashMap
613

@@ -52,20 +59,21 @@ XML to JSON to XML conversion
5259
```java
5360
String templateExpression = "Hi ${ddd} hello ${ar[0]} your home is ${USER_HOME}";
5461

55-
Template t = new Template("name", new StringReader(templateExpression), new Configuration());
56-
StringWriter out = new StringWriter();
57-
58-
JSONObject jobj1 = new JSONObject();
59-
jobj1.put("ddd","jsss");
60-
JSONArray ar = new JSONArray("['jhaldia','jdob']");
61-
jobj1.put("ar", ar);
62-
jobj1.put("USER_HOME", System.getProperty("user.home").replace("\\","/"));
63-
64-
t.process(jobj1, out );
65-
66-
String ret = out.toString();
67-
68-
System.out.println(ret);
62+
Template t = new Template("name", new StringReader(templateExpression), new Configuration());
63+
StringWriter out = new StringWriter();
64+
65+
JSONObject jobj1 = new JSONObject();
66+
jobj1.put("ddd","jsss");
67+
JSONArray ar = new JSONArray("['jhaldia','jdob']");
68+
jobj1.put("ar", ar);
69+
jobj1.put("USER_HOME", System.getProperty("user.home").replace("\\","/"));
70+
71+
t.process(jobj1, out );
72+
73+
String ret = out.toString();
74+
75+
System.out.println(ret);
76+
assertEquals("Hi jsss hello jhaldia your home is "+System.getProperty("user.home").replace("\\","/"),ret);
6977
```
7078

7179
```java
@@ -79,13 +87,18 @@ XML to JSON to XML conversion
7987
8088
### Ognl
8189
```java
82-
JSONObject jobj1 = new JSONObject();
83-
jobj1.put("ddd","jsss");
84-
JSONArray ar = new JSONArray("['jhaldia','jdob']");
85-
jobj1.put("ar", ar);
86-
System.out.println(Ognl.getValue("ar[0]", rootObject , jobj1 ));
87-
Object obj2 = Ognl.getValue("someBean.sss",context);
88-
System.out.println(obj2);
90+
Map rootObject = new HashMap();
91+
Map context = new HashMap();
92+
JSONObject jobj1 = new JSONObject();
93+
jobj1.put("ddd","jsss");
94+
JSONArray ar = new JSONArray("['jhaldia','jdob']");
95+
jobj1.put("ar", ar);
96+
context.put("someBean", jobj1);
97+
System.out.println(Ognl.getValue("ar[0]", rootObject , jobj1 ));
98+
assertEquals("jhaldia",Ognl.getValue("ar[0]", rootObject , jobj1 ));
99+
Object obj2 = Ognl.getValue("someBean.ddd",context);
100+
System.out.println(obj2);
101+
assertEquals("jsss", obj2);
89102
```
90103

91104

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.json</groupId>
66
<artifactId>json</artifactId>
7-
<version>20121205</version>
7+
<version>20121208</version>
88
<packaging>jar</packaging>
99
<name>json.org</name>
1010
<description>A reference implementation of a JSON package in Java.</description>

0 commit comments

Comments
 (0)