Skip to content

Use Appendable in place of Writer #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
run2000 wants to merge 14 commits into from
Closed

Use Appendable in place of Writer #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4892329
Adapt JSONWriter to use Appendable instead of Writer.
run2000 Jun 14, 2016
c91c37a
Remove executable bit.
run2000 Jun 14, 2016
826ceef
Minor tweaks.
run2000 Jul 2, 2016
2917cc5
Minor tweaks.
run2000 Jul 2, 2016
4a38c80
Merge from upstream.
run2000 Jul 27, 2016
0f579e4
Update version string
run2000 Jul 27, 2016
5daf2b9
Update version string
run2000 Jul 27, 2016
e94e25b
Update version string
run2000 Jul 27, 2016
bec3919
Update version string
run2000 Jul 27, 2016
0412cf1
Javadoc and copyright notice for JSONString
run2000 Jul 27, 2016
288c988
Cygwin fails me again, remove the execute bit.
run2000 Jul 28, 2016
c8c95c9
Revert whitespace, direct JSONObject.writeValue() call.
run2000 Aug 4, 2016
70f0dd9
Use appendValue, based on append, for writing directly.
run2000 Aug 5, 2016
73c5155
Revert whitespace.
run2000 Aug 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions JSONArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ of this software and associated documentation files (the "Software"), to deal
*/

import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.math.BigInteger;
Expand Down Expand Up @@ -78,7 +76,7 @@ of this software and associated documentation files (the "Software"), to deal
* </ul>
*
* @author JSON.org
* @version 2016-07-19
* @version 2016-08-04
*/
public class JSONArray implements Iterable<Object> {

Expand Down Expand Up @@ -447,7 +445,7 @@ public String join(String separator) throws JSONException {
if (i > 0) {
sb.append(separator);
}
sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
JSONObject.writeValue(sb, this.myArrayList.get(i));
Copy link
Contributor Author

@run2000 run2000 Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Write directly to the one StringBuilder, avoiding creation of temporary buffer.

}
return sb.toString();
}
Expand Down Expand Up @@ -1017,7 +1015,7 @@ public JSONArray put(int index, Object value) throws JSONException {
}

/**
* Creates a JSONPointer using an initialization string and tries to
* Creates a JSONPointer using an initialization string and tries to
* match it to an item within this JSONArray. For example, given a
* JSONArray initialized with this document:
* <pre>
Expand Down Expand Up @@ -1159,10 +1157,8 @@ public String toString() {
* @throws JSONException
*/
public String toString(int indentFactor) throws JSONException {
StringWriter sw = new StringWriter();
synchronized (sw.getBuffer()) {
return this.write(sw, indentFactor, 0).toString();
}
StringBuilder sw = new StringBuilder();
return this.write(sw, indentFactor, 0).toString();
}

Copy link
Contributor Author

@run2000 run2000 Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reverts a change related to #54

Basically, now that we use StringBuilder, which is not synchronizing on a buffer, instead of StringWriter, which does, the rationale for synchronizing no longer applies.

/**
Expand All @@ -1174,7 +1170,7 @@ public String toString(int indentFactor) throws JSONException {
* @return The writer.
* @throws JSONException
*/
public Writer write(Writer writer) throws JSONException {
public <T extends Appendable> T write(T writer) throws JSONException {
return this.write(writer, 0, 0);
}

Expand All @@ -1193,12 +1189,12 @@ public Writer write(Writer writer) throws JSONException {
* @return The writer.
* @throws JSONException
*/
public Writer write(Writer writer, int indentFactor, int indent)
public <T extends Appendable> T write(T writer, int indentFactor, int indent)
throws JSONException {
try {
boolean commanate = false;
int length = this.length();
writer.write('[');
writer.append('[');

if (length == 1) {
JSONObject.writeValue(writer, this.myArrayList.get(0),
Expand All @@ -1208,22 +1204,22 @@ public Writer write(Writer writer, int indentFactor, int indent)

for (int i = 0; i < length; i += 1) {
if (commanate) {
writer.write(',');
writer.append(',');
}
if (indentFactor > 0) {
writer.write('\n');
writer.append('\n');
}
JSONObject.indent(writer, newindent);
JSONObject.writeValue(writer, this.myArrayList.get(i),
indentFactor, newindent);
commanate = true;
}
if (indentFactor > 0) {
writer.write('\n');
writer.append('\n');
}
JSONObject.indent(writer, indent);
}
writer.write(']');
writer.append(']');
return writer;
} catch (IOException e) {
throw new JSONException(e);
Expand Down
Loading