You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2014/05/02 19:52:06 UTC
svn commit: r1591986 -
/lucene/dev/branches/lucene5376_2/lucene/server/src/java/org/apache/lucene/server/Server.java
Author: jdyer
Date: Fri May 2 17:52:05 2014
New Revision: 1591986
URL: http://svn.apache.org/r1591986
Log:
LUCENE-5376: convert GET parameters to JSON
Modified:
lucene/dev/branches/lucene5376_2/lucene/server/src/java/org/apache/lucene/server/Server.java
Modified: lucene/dev/branches/lucene5376_2/lucene/server/src/java/org/apache/lucene/server/Server.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/server/src/java/org/apache/lucene/server/Server.java?rev=1591986&r1=1591985&r2=1591986&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/server/src/java/org/apache/lucene/server/Server.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/server/src/java/org/apache/lucene/server/Server.java Fri May 2 17:52:05 2014
@@ -361,6 +361,14 @@ public class Server {
//System.out.println("cp cap: " + cb.capacity() + " readable=" + cb.readableBytes() + " chunked=" + request.isChunked());
// nocommit must get encoding, not assume UTF-8:
data = request.getContent().toString(CharsetUtil.UTF_8);
+ } else if(request.getMethod() == HttpMethod.GET){
+ List<String> json = params.remove("json");
+ if(json==null || json.isEmpty()) {
+ data = convertGetParametersToJson(params);
+ params.clear();
+ } else {
+ data = json.iterator().next();
+ }
} else {
data = null;
}
@@ -431,7 +439,20 @@ public class Server {
super.messageReceived(ctx, e);
}
-
+
+ private String convertGetParametersToJson(Map<String, List<String>> params) {
+ JSONObject json = new JSONObject();
+ for(Map.Entry<String,List<String>> entry : params.entrySet()) {
+ List<String> values = entry.getValue();
+ if(values.size()==1) {
+ json.put(entry.getKey(), values.iterator().next());
+ } else {
+ json.put(entry.getKey(), values);
+ }
+ }
+ return json.toString();
+ }
+
@Override
public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
//System.out.println("SVR.exceptionCaught: " + e);