You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/12/25 15:04:15 UTC
svn commit: r1553384 - in /lucene/dev/branches/lucene5376/lucene/server:
ivy.xml src/java/org/apache/lucene/server/IndexState.java
src/java/org/apache/lucene/server/Server.java
Author: rmuir
Date: Wed Dec 25 14:04:14 2013
New Revision: 1553384
URL: http://svn.apache.org/r1553384
Log:
LUCENE-5376: remove crazy use of jackson for pretty-printing. jackson only used in the indexing api now
Modified:
lucene/dev/branches/lucene5376/lucene/server/ivy.xml
lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/IndexState.java
lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java
Modified: lucene/dev/branches/lucene5376/lucene/server/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/ivy.xml?rev=1553384&r1=1553383&r2=1553384&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/ivy.xml (original)
+++ lucene/dev/branches/lucene5376/lucene/server/ivy.xml Wed Dec 25 14:04:14 2013
@@ -24,7 +24,7 @@
<dependency org="commons-codec" name="commons-codec" rev="${/commons-codec/commons-codec}" transitive="false"/>
<dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
- <dependency org="net.minidev" name="json-smart" rev="1.1.1" transitive="false"/>
+ <dependency org="net.minidev" name="json-smart" rev="1.2" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/IndexState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/IndexState.java?rev=1553384&r1=1553383&r2=1553384&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/IndexState.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/IndexState.java Wed Dec 25 14:04:14 2013
@@ -102,10 +102,8 @@ import org.apache.lucene.store.RAMDirect
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.PrintStreamInfoStream;
import org.apache.lucene.util.Version;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
import net.minidev.json.JSONObject;
+import net.minidev.json.JSONStyleIdent;
import net.minidev.json.JSONValue;
import net.minidev.json.parser.ParseException;
@@ -236,12 +234,7 @@ public class IndexState implements Close
@Override
protected void saveOne(IndexOutput out, JSONObject state) throws IOException {
// Pretty print:
- ObjectMapper mapper = new ObjectMapper();
- JsonNode rootNode = mapper.readValue(state.toString(), JsonNode.class);
- //ObjectWriter writer = mapper.defaultPrettyPrintingWriter();
- // ***IMPORTANT!!!*** for Jackson 2.x use the line below instead of the one above:
- ObjectWriter writer = mapper.writer().withDefaultPrettyPrinter();
- String pretty = writer.writeValueAsString(rootNode);
+ String pretty = state.toJSONString(new JSONStyleIdent());
byte[] bytes = IndexState.toUTF8(pretty.toString());
out.writeBytes(bytes, 0, bytes.length);
}
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java?rev=1553384&r1=1553383&r2=1553384&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java Wed Dec 25 14:04:14 2013
@@ -42,9 +42,6 @@ import org.apache.lucene.server.http.Htt
import org.apache.lucene.server.params.*;
import org.apache.lucene.server.params.PolyType.PolyEntry;
import org.apache.lucene.util.NamedThreadFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
@@ -76,6 +73,7 @@ import org.jboss.netty.handler.codec.htt
import org.jboss.netty.handler.codec.http.QueryStringDecoder;
import org.jboss.netty.util.CharsetUtil;
import net.minidev.json.JSONObject;
+import net.minidev.json.JSONStyleIdent;
import net.minidev.json.parser.ContainerFactory;
import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException;
@@ -199,10 +197,7 @@ public class Server {
}
// Pretty print the leftover (unhandled) params:
- ObjectMapper mapper = new ObjectMapper();
- JsonNode rootNode = mapper.readValue(requestData.toString(), JsonNode.class);
- ObjectWriter writer = mapper.writer().withDefaultPrettyPrinter();
- String pretty = writer.writeValueAsString(rootNode);
+ String pretty = requestData.toJSONString(new JSONStyleIdent());
String s = "unrecognized parameters:\n" + pretty;
String details = findFirstWrongParam(handler.getType(), fullRequest, requestData, new ArrayList<String>());
if (details != null) {