Resolve #276: merge branch 'blackwinter-json-encoder-pretty-prefix'

Author: cboehme

metafacture-json/src/main/java/org/metafacture/json/JsonEncoder.java

@@ -34,6 +34,7 @@
 import com.fasterxml.jackson.core.SerializableString;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
 import com.fasterxml.jackson.core.io.SerializedString;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 
 /**
  * Serialises an object as JSON. Records and entities are represented
@@ -66,11 +67,7 @@ public JsonEncoder() {
 	}
 
 	public void setPrettyPrinting(final boolean prettyPrinting) {
-		if (prettyPrinting) {
-			jsonGenerator.useDefaultPrettyPrinter();
-		} else {
-			jsonGenerator.setPrettyPrinter(null);
-		}
+		jsonGenerator.setPrettyPrinter(prettyPrinting ? new DefaultPrettyPrinter((SerializableString) null) : null);
 	}
 
 	public boolean getPrettyPrinting() {

metafacture-json/src/test/java/org/metafacture/json/JsonEncoderTest.java

@@ -181,6 +181,22 @@ public void testIssue152ShouldNotPrefixOutputWithSpaces() {
 		ordered.verify(receiver).process(fixQuotes("{'L2':'V2'}"));
 	}
 
+	@Test
+	public void testShouldNotPrefixPrettyPrintedOutputWithSpaces() {
+		encoder.setPrettyPrinting(true);
+
+		encoder.startRecord("");
+		encoder.literal(LITERAL1, VALUE1);
+		encoder.endRecord();
+		encoder.startRecord("");
+		encoder.literal(LITERAL2, VALUE2);
+		encoder.endRecord();
+
+		final InOrder ordered = inOrder(receiver);
+		ordered.verify(receiver).process(fixQuotes("{\n  'L1' : 'V1'\n}"));
+		ordered.verify(receiver).process(fixQuotes("{\n  'L2' : 'V2'\n}"));
+	}
+
 	/*
 	 * Utility method which replaces all single quotes in a string with double quotes.
 	 * This allows to specify the JSON output in the test cases without having to wrap