Author: hsaputra
Date: Tue Aug 23 19:42:03 2011
New Revision: 1160870
URL: http://svn.apache.org/viewvc?rev=1160870&view=rev
Log:
SHINDIG-1593 | Use shindig.json-rpc.result-field property from
shindig.properties file to add wrapper to the returned data.
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=1160870&r1=1160869&r2=1160870&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
Tue Aug 23 19:42:03 2011
@@ -71,7 +71,8 @@ public class JsonRpcServlet extends ApiS
private String jsonRpcResultField = "result";
private boolean jsonRpcBothFields = false;
- @Inject
+
+ @Inject(optional = true)
void setJsonRpcResultField(@Named("shindig.json-rpc.result-field")String
jsonRpcResultField) {
this.jsonRpcResultField = jsonRpcResultField;
jsonRpcBothFields = "both".equals(jsonRpcResultField);
@@ -236,8 +237,9 @@ public class JsonRpcServlet extends ApiS
if (jsonRpcBothFields) {
result.put("result", data);
result.put("data", data);
+ } else {
+ result.put(jsonRpcResultField, data);
}
- result.put(jsonRpcResultField, data);
}
/**
