Skip to content
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.

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

Revert "Change IonSystemBuilder's default charset to UTF-8 (#802)" #820

Merged
merged 1 commit into from
Apr 30, 2024
Merged
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions src/main/java/com/amazon/ion/system/IonSystemBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public static IonSystemBuilder standard()
IonCatalog myCatalog;
boolean myStreamCopyOptimized = false;

IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard();
IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard().withCharsetAscii();
IonBinaryWriterBuilder binaryWriterBuilder = IonBinaryWriterBuilder.standard();
IonReaderBuilder readerBuilder = IonReaderBuilder.standard();

Expand Down Expand Up @@ -269,7 +269,8 @@ public final IonSystemBuilder withStreamCopyOptimized(boolean optimized)

/**
* Gets the text writer builder whose options will be used when building an
* {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()} will be used.
* {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()}
* using {@code US-ASCII} encoding will be used.
*
* @see #setIonTextWriterBuilder(IonTextWriterBuilder)
* @see #withIonTextWriterBuilder(IonTextWriterBuilder)
Expand All @@ -283,7 +284,8 @@ public final IonTextWriterBuilder getIonTextWriterBuilder() {
* an {@link IonSystem}.
*
* @param builder the writer builder to use in built systems.
* If unset, each system will be built with {@link IonTextWriterBuilder#standard()}.
* If unset, each system will be built with {@link IonTextWriterBuilder#standard()}
* using {@code US-ASCII} encoding.
*
* @see #getIonTextWriterBuilder()
* @see #withIonTextWriterBuilder(IonTextWriterBuilder)
Expand All @@ -303,7 +305,8 @@ public final void setIonTextWriterBuilder(IonTextWriterBuilder builder) {
* always be used instead.
*
* @param builder the writer builder to use in built systems.
* If unset, each system will be built with {@link IonTextWriterBuilder#standard()}.
* If unset, each system will be built with {@link IonTextWriterBuilder#standard()}
* using {@code US-ASCII} encoding.
*
* @see #getIonTextWriterBuilder()
* @see #setIonTextWriterBuilder(IonTextWriterBuilder)
Expand Down
Loading