Jetty 12 : XmlAppendable use Charset, not String #8609
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joakime
commented
Sep 22, 2022
| } | ||
|
|
||
| public XmlAppendable(Appendable out) throws IOException | ||
| { | ||
| this(out, 2); | ||
| } | ||
|
|
||
| public XmlAppendable(Appendable out, String encoding) throws IOException | ||
| public XmlAppendable(Appendable out, Charset charset) throws IOException |
There was a problem hiding this comment.
This constructor is not used outside of this class, can probably be removed.
| { | ||
| this(out, 2, encoding); | ||
| this(out, 2, charset); | ||
| } | ||
|
|
||
| public XmlAppendable(Appendable out, int indent) throws IOException |
There was a problem hiding this comment.
This constructor is not used outside of this class, can probably be removed.
| } | ||
|
|
||
| public XmlAppendable(Appendable out, int indent, String encoding) throws IOException | ||
| public XmlAppendable(Appendable out, int indent, Charset charset) throws IOException |
There was a problem hiding this comment.
This constructor is not used outside of this class, can probably be removed/collapsed into the constructors that are used.
| @@ -30,31 +33,31 @@ | |||
| private final Stack<String> _tags = new Stack<>(); | |||
| private String _space = ""; | |||
|
|
|||
| public XmlAppendable(OutputStream out, String encoding) throws IOException | |||
| public XmlAppendable(OutputStream out, Charset charset) throws IOException | |||
There was a problem hiding this comment.
This constructor is never used with a Charset that isn't UTF-8, should probably just remove this constructor too and have only 1 constructor that has only 1 parameter OutputStream.
sbordet
approved these changes
Sep 22, 2022
| @@ -16,6 +16,7 @@ | |||
| import java.io.FileNotFoundException; | |||
| import java.io.IOException; | |||
| import java.io.OutputStream; | |||
| import java.nio.charset.StandardCharsets; | |||
| @@ -16,6 +16,7 @@ | |||
| import java.io.FileNotFoundException; | |||
| import java.io.IOException; | |||
| import java.io.OutputStream; | |||
| import java.nio.charset.StandardCharsets; | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change to have XmlAppendable use Charset not String to create outputstream and whatnot.
Taken from PR #8597