Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#63745 - Fix line endings ... again 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1869013 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2019-10-26 19:13:16 +00:00
parent 8906cba704
commit 52b4ecfa9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/org/apache/poi/util/GenericRecordJsonWriter.java
View File

@ -56,6 +56,7 @@ public class GenericRecordJsonWriter implements Closeable {
private static final String TABS; private static final String TABS;
private static final String ZEROS = "0000000000000000"; private static final String ZEROS = "0000000000000000";
private static final Pattern ESC_CHARS = Pattern.compile("[\"\\p{Cntrl}\\\\]"); private static final Pattern ESC_CHARS = Pattern.compile("[\"\\p{Cntrl}\\\\]");
private static final String NL = System.getProperty("line.separator");
@FunctionalInterface @FunctionalInterface
protected interface GenericRecordHandler { protected interface GenericRecordHandler {
@ -192,7 +193,7 @@ public class GenericRecordJsonWriter implements Closeable {
} }
indent++; indent++;
aw.setHoldBack(tabs() + (hasProperties ? ", " : "") + "\"children\": [\n"); aw.setHoldBack(tabs() + (hasProperties ? ", " : "") + "\"children\": [" + NL);
final int oldChildIndex = childIndex; final int oldChildIndex = childIndex;
childIndex = 0; childIndex = 0;
long cnt = list.stream().filter(l -> writeValue(null, l) && ++childIndex > 0).count(); long cnt = list.stream().filter(l -> writeValue(null, l) && ++childIndex > 0).count();
@ -216,7 +217,7 @@ public class GenericRecordJsonWriter implements Closeable {
protected boolean writeProp(String name, Supplier<?> value) { protected boolean writeProp(String name, Supplier<?> value) {
final boolean isNext = (childIndex>0); final boolean isNext = (childIndex>0);
aw.setHoldBack(isNext ? "\n" + tabs() + "\t, " : tabs() + "\t "); aw.setHoldBack(isNext ? NL + tabs() + "\t, " : tabs() + "\t ");
final int oldChildIndex = childIndex; final int oldChildIndex = childIndex;
childIndex = 0; childIndex = 0;
boolean written = writeValue(name, value.get()); boolean written = writeValue(name, value.get());