Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused methods

Browse Source 
Removed JSONUtil.serialize(Object) in favor for using the method that
accepts a boolean to control bean caching functionality.
This commit is contained in:
Naros
2015-06-22 09:21:13 -05:00
parent a778ba1a3d
commit 88bfeb556d
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
+3 -15
View File
@@ -55,22 +55,10 @@ import com.opensymphony.xwork2.util.WildcardUtil;
public class JSONUtil {
public final static String RFC3339_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
public static final boolean CACHE_BEAN_INFO_DEFAULT = true;
private static final Logger LOG = LogManager.getLogger(JSONUtil.class);
private static final boolean CACHE_BEAN_INFO_DEFAULT = true;
/**
* Serializes an object into JSON.
*
* @param object
* to be serialized
* @return JSON string
* @throws JSONException
*/
public static String serialize(Object object) throws JSONException {
return serialize(object, CACHE_BEAN_INFO_DEFAULT);
}
/**
* Serializes an object into JSON.
*
plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
+13 -11
View File
@@ -20,16 +20,6 @@
*/
package org.apache.struts2.json;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.SimpleDateFormat;
@@ -45,6 +35,18 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
/**
* JSONResultTest
*/
@@ -60,7 +62,7 @@ public class JSONResultTest extends StrutsTestCase {
Map map = new HashMap();
map.put("createtime", new Date());
try {
JSONUtil.serialize(map);
JSONUtil.serialize(map, JSONUtil.CACHE_BEAN_INFO_DEFAULT);
} catch (JSONException e) {
fail(e.getMessage());
}
plugins/json/src/test/java/org/apache/struts2/json/JSONUtilTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class JSONUtilTest extends TestCase {
bean1.setEnumField(AnEnum.ValueA);
bean1.setEnumBean(AnEnumBean.Two);
String json = JSONUtil.serialize(bean1);
String json = JSONUtil.serialize(bean1, JSONUtil.CACHE_BEAN_INFO_DEFAULT);
Map result = (Map) JSONUtil.deserialize(json);
assertEquals("str", result.get("stringField"));