This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 16737e3df5 TODO-251: Remove dead fileCharset(...) serializer/parser
builder API
16737e3df5 is described below
commit 16737e3df51f1a444f105a8ad021d3e9f5460b51
Author: James Bognar <[email protected]>
AuthorDate: Thu Jul 16 14:08:36 2026 -0400
TODO-251: Remove dead fileCharset(...) serializer/parser builder API
Follow-up to TODO-248 (stream-only marshaller I/O). Now that serialize/parse
operate on streams only, the fileCharset(...) builder methods,
getFileCharset()
getters, PROP_fileCharset keys, backing plumbing, and the @SerializerConfig
/
@ParserConfig fileCharset attributes are dead code with no remaining
callers.
Removes the fileCharset surface from:
- WriterSerializer / WriterSerializerSession / SerializerConfig /
SerializerConfigAnnotation
- ReaderParser / ReaderParserSession / ParserConfig / ParserConfigAnnotation
- Marshaller
Updates affected tests (ContextSession_Test, ParserConfigAnnotationTest,
SerializerConfigAnnotation_Test, RdfParser_Test, RdfSerializer_Test).
Co-authored-by: Cursor <[email protected]>
---
.../juneau/marshall/jena/RdfParser_Test.java | 2 -
.../juneau/marshall/jena/RdfSerializer_Test.java | 2 -
.../juneau/marshall/marshaller/Marshaller.java | 6 +--
.../juneau/marshall/parser/ParserConfig.java | 24 -----------
.../marshall/parser/ParserConfigAnnotation.java | 1 -
.../juneau/marshall/parser/ReaderParser.java | 50 ----------------------
.../marshall/parser/ReaderParserSession.java | 38 ----------------
.../marshall/serializer/SerializerConfig.java | 30 -------------
.../serializer/SerializerConfigAnnotation.java | 1 -
.../marshall/serializer/WriterSerializer.java | 50 ----------------------
.../serializer/WriterSerializerSession.java | 39 -----------------
.../org/apache/juneau/ContextSession_Test.java | 25 +----------
.../parser/ParserConfigAnnotationTest.java | 5 ---
.../SerializerConfigAnnotation_Test.java | 4 --
14 files changed, 4 insertions(+), 273 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfParser_Test.java
b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfParser_Test.java
index d1cb2e5a37..fc8b473368 100644
---
a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfParser_Test.java
+++
b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfParser_Test.java
@@ -332,7 +332,6 @@ class RdfParser_Test extends TestBase {
@Test void d07_exampleAndCharsets() {
assertNotNull(RdfParser.create().example(Integer.class,
"42").build());
assertNotNull(RdfParser.create().example(Integer.class,
42).build());
-
assertNotNull(RdfParser.create().fileCharset(java.nio.charset.StandardCharsets.UTF_8).build());
assertNotNull(RdfParser.create().streamCharset(java.nio.charset.StandardCharsets.UTF_8).build());
}
@@ -433,7 +432,6 @@ class RdfParser_Test extends TestBase {
assertNotNull(p.createSession().debug(false).build());
assertNotNull(p.createSession().javaMethod(null).build());
assertNotNull(p.createSession().locale(Locale.US).build());
-
assertNotNull(p.createSession().fileCharset(java.nio.charset.Charset.defaultCharset()).build());
assertNotNull(p.createSession().mediaType(org.apache.juneau.commons.http.MediaType.JSON).build());
}
diff --git
a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfSerializer_Test.java
b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfSerializer_Test.java
index 8913ab4745..d5c5bf137d 100644
---
a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfSerializer_Test.java
+++
b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/jena/RdfSerializer_Test.java
@@ -375,7 +375,6 @@ class RdfSerializer_Test extends TestBase {
@Test void f02_exampleAndCharsets() {
assertNotNull(RdfSerializer.create().example(Integer.class, "42").build());
assertNotNull(RdfSerializer.create().example(Integer.class, 42).build());
-
assertNotNull(RdfSerializer.create().fileCharset(java.nio.charset.StandardCharsets.UTF_8).build());
assertNotNull(RdfSerializer.create().streamCharset(java.nio.charset.StandardCharsets.UTF_8).build());
}
@@ -609,7 +608,6 @@ class RdfSerializer_Test extends TestBase {
assertNotNull(s.createSession().debug(false).build());
assertNotNull(s.createSession().javaMethod(null).build());
assertNotNull(s.createSession().locale(Locale.US).build());
-
assertNotNull(s.createSession().fileCharset(java.nio.charset.Charset.defaultCharset()).build());
assertNotNull(s.createSession().mediaType(org.apache.juneau.commons.http.MediaType.JSON).build());
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/Marshaller.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/Marshaller.java
index c6c6cc2345..316ca58c78 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/Marshaller.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/Marshaller.java
@@ -122,8 +122,7 @@ public abstract class Marshaller {
* {@link
org.apache.juneau.marshall.parser.ReaderParser.Builder#streamCharset(Charset)}
property value).
* <li><code><jk>byte</jk>[]</code> containing UTF-8
encoded text (or charset defined by
* {@link
org.apache.juneau.marshall.parser.ReaderParser.Builder#streamCharset(Charset)}
property value).
- * <li>{@link File} containing system encoded text (or
charset defined by
- * {@link
org.apache.juneau.marshall.parser.ReaderParser.Builder#fileCharset(Charset)}
property value).
+ * <li>{@link File} containing system encoded text.
* </ul>
* <br>Stream-based parsers can handle the following input class
types:
* <ul>
@@ -194,8 +193,7 @@ public abstract class Marshaller {
* {@link
org.apache.juneau.marshall.parser.ReaderParser.Builder#streamCharset(Charset)}
property value).
* <li><code><jk>byte</jk>[]</code> containing UTF-8
encoded text (or charset defined by
* {@link
org.apache.juneau.marshall.parser.ReaderParser.Builder#streamCharset(Charset)}
property value).
- * <li>{@link File} containing system encoded text (or
charset defined by
- * {@link
org.apache.juneau.marshall.parser.ReaderParser.Builder#fileCharset(Charset)}
property value).
+ * <li>{@link File} containing system encoded text.
* </ul>
* <br>Stream-based parsers can handle the following input class
types:
* <ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfig.java
index 0faceffcb7..20079f675e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfig.java
@@ -120,30 +120,6 @@ public @interface ParserConfig {
*/
String debugOutputLines() default "";
- /**
- * File charset.
- *
- * <p>
- * The character set to use for reading <c>Files</c> from the file
system.
- *
- * <p>
- * Used when passing in files to {@link Parser#parse(Object, Class)}.
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>
- * <js>"DEFAULT"</js> can be used to indicate the JVM
default file system charset.
- * <li class='note'>
- * Supports <a class="doclink"
href="https://juneau.apache.org/docs/topics/DefaultVarResolver";>VarResolver.DEFAULT</a>
(e.g. <js>"$C{myConfigVar}"</js>).
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='jm'>{@link ReaderParser.Builder#fileCharset(Charset)}
- * </ul>
- *
- * @return The annotation value.
- */
- String fileCharset() default "";
-
/**
* Parser listener.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfigAnnotation.java
index 75a91edd4a..39a1cfa01b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ParserConfigAnnotation.java
@@ -111,7 +111,6 @@ public class ParserConfigAnnotation {
public void apply(AnnotationInfo<ParserConfig> ai,
ReaderParser.Builder b) {
ParserConfig a = ai.inner();
- charset(a.fileCharset()).ifPresent(b::fileCharset);
charset(a.streamCharset()).ifPresent(b::streamCharset);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParser.java
index c97dbfdd06..c21c46eb3e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParser.java
@@ -49,7 +49,6 @@ import org.apache.juneau.commons.collections.*;
public class ReaderParser extends Parser {
// Property name constants
- private static final String PROP_fileCharset = "fileCharset";
private static final String PROP_streamCharset = "streamCharset";
// Argument name constants for assertArgNotNull
@@ -63,14 +62,12 @@ public class ReaderParser extends Parser {
})
public abstract static class Builder<SELF extends Builder<SELF>>
extends Parser.Builder<SELF> {
- private Charset fileCharset;
private Charset streamCharset;
/**
* Constructor, default settings.
*/
protected Builder() {
- fileCharset =
env("ReaderParser.fileCharset").map(Charset::forName).orElse(Charset.defaultCharset());
streamCharset = env("ReaderParser.streamCharset", UTF8);
}
@@ -82,7 +79,6 @@ public class ReaderParser extends Parser {
*/
protected Builder(Builder<?> copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
- fileCharset = copyFrom.fileCharset;
streamCharset = copyFrom.streamCharset;
}
@@ -94,7 +90,6 @@ public class ReaderParser extends Parser {
*/
protected Builder(ReaderParser copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
- fileCharset = copyFrom.fileCharset;
streamCharset = copyFrom.streamCharset;
}
@@ -106,44 +101,11 @@ public class ReaderParser extends Parser {
@Override /* Overridden from Context.Builder<?> */
public abstract SELF copy();
- /**
- * File charset.
- *
- * <p>
- * The character set to use for reading <c>Files</c> from the
file system.
- *
- * <p>
- * Used when passing in files to {@link Parser#parse(Object,
Class)}.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bjava'>
- * <jc>// Create a parser that reads UTF-8 files.</jc>
- * ReaderParser <jv>parser</jv> = JsonParser
- * .<jsm>create</jsm>()
- * .fileCharset(<js>"UTF-8"</js>)
- * .build();
- *
- * <jc>// Use it to read a UTF-8 encoded file.</jc>
- * MyBean <jv>myBean</jv> =
<jv>parser</jv>.parse(<jk>new</jk> File(<js>"MyBean.txt"</js>),
MyBean.<jk>class</jk>);
- * </p>
- *
- * @param value
- * The new value for this property.
- * <br>The default value is <js>"DEFAULT"</js> which
causes the system default to be used.
- * <br>Can be <jk>null</jk> (defaults to system default).
- * @return This object.
- */
- public SELF fileCharset(Charset value) {
- fileCharset = value;
- return self();
- }
-
@Override /* Overridden from Context.Builder<?> */
public HashKey hashKey() {
// @formatter:off
return HashKey.of(
super.hashKey(),
- fileCharset,
streamCharset
);
// @formatter:on
@@ -217,7 +179,6 @@ public class ReaderParser extends Parser {
return new DefaultBuilder();
}
- private final Charset fileCharset;
private final Charset streamCharset;
/**
@@ -227,7 +188,6 @@ public class ReaderParser extends Parser {
*/
protected ReaderParser(Builder<?> builder) {
super(builder);
- fileCharset = builder.fileCharset;
streamCharset = builder.streamCharset;
}
@@ -242,15 +202,6 @@ public class ReaderParser extends Parser {
@Override /* Overridden from Parser */
public final boolean isReaderParser() { return true; }
- /**
- * File charset.
- *
- * @see Builder#fileCharset(Charset)
- * @return
- * The character set to use for reading <c>Files</c> from the file
system.
- */
- protected final Charset getFileCharset() { return fileCharset; }
-
/**
* Input stream charset.
*
@@ -263,7 +214,6 @@ public class ReaderParser extends Parser {
@Override /* Overridden from Parser */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a(PROP_fileCharset, fileCharset)
.a(PROP_streamCharset, streamCharset);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParserSession.java
index f0fd45833c..e12d55fc3b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parser/ReaderParserSession.java
@@ -40,9 +40,7 @@ import org.apache.juneau.commons.collections.*;
public class ReaderParserSession extends ParserSession {
// Property name constants
- private static final String PROP_fileCharset = "fileCharset";
private static final String PROP_streamCharset = "streamCharset";
- private static final String PROP_ReaderParserSession_fileCharset =
"ReaderParserSession.fileCharset";
private static final String PROP_ReaderParserSession_streamCharset =
"ReaderParserSession.streamCharset";
// Argument name constants for assertArgNotNull
@@ -56,7 +54,6 @@ public class ReaderParserSession extends ParserSession {
})
public abstract static class Builder<SELF extends Builder<SELF>>
extends ParserSession.Builder<SELF> {
- private Charset fileCharset;
private Charset streamCharset;
private ReaderParser ctx;
@@ -69,7 +66,6 @@ public class ReaderParserSession extends ParserSession {
protected Builder(ReaderParser ctx) {
super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
- fileCharset = ctx.getFileCharset();
streamCharset = ctx.getStreamCharset();
}
@@ -78,28 +74,6 @@ public class ReaderParserSession extends ParserSession {
return new ReaderParserSession(this);
}
- /**
- * File charset.
- *
- * <p>
- * The character set to use for reading Files from the file
system.
- *
- * <p>
- * Used when passing in files to {@link Parser#parse(Object,
Class)}.
- *
- * <p>
- * If not specified, defaults to the JVM system default charset.
- *
- * @param value
- * The new property value.
- * <br>Can be <jk>null</jk>.
- * @return This object.
- */
- public SELF fileCharset(Charset value) {
- fileCharset = value;
- return self();
- }
-
@Override /* Overridden from Builder */
public SELF property(String key, Object value) {
if (key == null) {
@@ -107,8 +81,6 @@ public class ReaderParserSession extends ParserSession {
return self();
}
switch (key) {
- case PROP_fileCharset,
PROP_ReaderParserSession_fileCharset:
- return fileCharset(cvt(value,
Charset.class));
case PROP_streamCharset,
PROP_ReaderParserSession_streamCharset:
return streamCharset(cvt(value,
Charset.class));
default:
@@ -166,7 +138,6 @@ public class ReaderParserSession extends ParserSession {
}
private final ReaderParser ctx;
- private final Charset fileCharset;
private final Charset streamCharset;
/**
@@ -177,7 +148,6 @@ public class ReaderParserSession extends ParserSession {
protected ReaderParserSession(Builder<?> builder) {
super(builder);
ctx = builder.ctx;
- fileCharset = builder.fileCharset;
streamCharset = builder.streamCharset;
}
@@ -208,13 +178,6 @@ public class ReaderParserSession extends ParserSession {
return setPipe(new ParserPipe(input, isDebug(), true,
ctx.isAutoCloseStreams(), ctx.isUnbuffered(), streamCharset));
}
- /**
- * Returns the file charset defined on this session.
- *
- * @return the file charset defined on this session.
- */
- public Charset getFileCharset() { return fileCharset; }
-
/**
* Returns the stream charset defined on this session.
*
@@ -228,7 +191,6 @@ public class ReaderParserSession extends ParserSession {
@Override /* Overridden from ParserSession */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a(PROP_fileCharset, fileCharset)
.a(PROP_streamCharset, streamCharset);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfig.java
index c2841f512c..28abefbf55 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfig.java
@@ -183,36 +183,6 @@ public @interface SerializerConfig {
*/
String detectRecursions() default "";
- /**
- * File charset.
- *
- * <p>
- * The character set to use for writing Files to the file system.
- *
- * <p>
- * Used when passing in files to {@link Serializer#serialize(Object,
Object)}.
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>
- * Format: string
- * <li class='note'>
- * "DEFAULT" can be used to indicate the JVM default file
system charset.
- * <li class='note'>
- * Default: JVM system default.
- * <li class='note'>
- * Supports <a class="doclink"
href="https://juneau.apache.org/docs/topics/DefaultVarResolver";>VarResolver.DEFAULT</a>
(e.g. <js>"$C{myConfigVar}"</js>).
- * <li class='note'>
- * This setting does not apply to the RDF serializers.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='jm'>{@link
WriterSerializer.Builder#fileCharset(Charset)}
- * </ul>
- *
- * @return The annotation value.
- */
- String fileCharset() default "";
-
/**
* Ignore recursion errors.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation.java
index 31fc03a4cd..4787e97647 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation.java
@@ -122,7 +122,6 @@ public class SerializerConfigAnnotation {
public void apply(AnnotationInfo<SerializerConfig> ai,
WriterSerializer.Builder b) {
SerializerConfig a = ai.inner();
- charset(a.fileCharset()).ifPresent(b::fileCharset);
integer(a.maxIndent(),
"maxIndent").ifPresent(b::maxIndent);
character(a.quoteChar(),
"quoteChar").ifPresent(b::quoteChar);
charset(a.streamCharset()).ifPresent(b::streamCharset);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializer.java
index 9dc669c591..feae428c97 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializer.java
@@ -46,7 +46,6 @@ import org.apache.juneau.marshall.json5.*;
public class WriterSerializer extends Serializer implements
ThrowingFunction<Object,String> {
// Property name constants
- private static final String PROP_fileCharset = "fileCharset";
private static final String PROP_maxIndent = "maxIndent";
private static final String PROP_quoteChar = "quoteChar";
private static final String PROP_streamCharset = "streamCharset";
@@ -66,7 +65,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
private boolean useWhitespace;
private Character quoteChar;
private Character quoteCharOverride;
- private Charset fileCharset;
private Charset streamCharset;
private int maxIndent;
@@ -74,7 +72,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
* Constructor, default settings.
*/
protected Builder() {
- fileCharset = Charset.defaultCharset();
streamCharset = UTF8;
maxIndent = env("WriterSerializer.maxIndent", 100);
quoteChar = env("WriterSerializer.quoteChar").map(x ->
(!x.isEmpty() ? x.charAt(0) : null)).orElse(null);
@@ -90,7 +87,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
*/
protected Builder(Builder<?> copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
- fileCharset = copyFrom.fileCharset;
streamCharset = copyFrom.streamCharset;
maxIndent = copyFrom.maxIndent;
quoteChar = copyFrom.quoteChar;
@@ -106,7 +102,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
*/
protected Builder(WriterSerializer copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
- fileCharset = copyFrom.getFileCharset();
streamCharset = copyFrom.getStreamCharset();
maxIndent = copyFrom.maxIndent;
quoteChar = copyFrom.quoteChar;
@@ -122,44 +117,11 @@ public class WriterSerializer extends Serializer
implements ThrowingFunction<Obj
@Override /* Overridden from Context.Builder<?> */
public abstract SELF copy();
- /**
- * File charset.
- *
- * <p>
- * The character set to use for writing <c>Files</c> to the
file system.
- *
- * <p>
- * Used when passing in files to {@link
Serializer#serialize(Object, Object)}.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bjava'>
- * <jc>// Create a serializer that writes UTF-8 files.</jc>
- * WriterSerializer <jv>serializer</jv> = JsonSerializer
- * .<jsm>create</jsm>()
- *
.fileCharset(Charset.<jsm>forName</jsm>(<js>"UTF-8"</js>))
- * .build();
- *
- * <jc>// Use it to read a UTF-8 encoded file.</jc>
- * <jv>serializer</jv>.serialize(<jk>new</jk>
File(<js>"MyBean.txt"</js>), <jv>myBean</jv>);
- * </p>
- *
- * @param value
- * The new value for this property.
- * <br>The default is the system JVM setting.
- * <br>Can be <jk>null</jk> (defaults to system default).
- * @return This object.
- */
- public SELF fileCharset(Charset value) {
- fileCharset = value;
- return self();
- }
-
@Override /* Overridden from Context.Builder<?> */
public HashKey hashKey() {
// @formatter:off
return HashKey.of(
super.hashKey(),
- fileCharset,
streamCharset,
maxIndent,
quoteChar,
@@ -431,7 +393,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
protected final boolean useWhitespace;
protected final Character quoteChar;
protected final Character quoteCharOverride;
- private final Charset fileCharset;
private final Charset streamCharset;
protected final int maxIndent;
@@ -446,7 +407,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
protected WriterSerializer(Builder<?> builder) {
super(builder);
- fileCharset = builder.fileCharset;
maxIndent = builder.maxIndent;
quoteChar = builder.quoteChar;
quoteCharOverride = builder.quoteCharOverride;
@@ -540,15 +500,6 @@ public class WriterSerializer extends Serializer
implements ThrowingFunction<Obj
}
}
- /**
- * File charset.
- *
- * @see Builder#fileCharset(Charset)
- * @return
- * The character set to use when writing to <c>Files</c> on the
file system.
- */
- protected final Charset getFileCharset() { return fileCharset; }
-
/**
* Maximum indentation.
*
@@ -588,7 +539,6 @@ public class WriterSerializer extends Serializer implements
ThrowingFunction<Obj
@Override /* Overridden from Serializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a(PROP_fileCharset, fileCharset)
.a(PROP_maxIndent, maxIndent)
.a(PROP_quoteChar, quoteChar)
.a(PROP_streamCharset, streamCharset)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializerSession.java
index e3cf393b67..fcdbf391e8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/WriterSerializerSession.java
@@ -52,12 +52,10 @@ import org.apache.juneau.commons.collections.*;
public class WriterSerializerSession extends SerializerSession {
// Property name constants
- private static final String PROP_fileCharset = "fileCharset";
private static final String PROP_streamCharset = "streamCharset";
private static final String PROP_useWhitespace = "useWhitespace";
private static final String PROP_maxIndent = "maxIndent";
private static final String PROP_quoteChar = "quoteChar";
- private static final String PROP_WriterSerializerSession_fileCharset =
"WriterSerializerSession.fileCharset";
private static final String PROP_WriterSerializerSession_streamCharset
= "WriterSerializerSession.streamCharset";
private static final String PROP_WriterSerializerSession_useWhitespace
= "WriterSerializerSession.useWhitespace";
private static final String PROP_WriterSerializerSession_maxIndent =
"WriterSerializerSession.maxIndent";
@@ -75,7 +73,6 @@ public class WriterSerializerSession extends
SerializerSession {
public abstract static class Builder<SELF extends Builder<SELF>>
extends SerializerSession.Builder<SELF> {
private boolean useWhitespace;
- private Charset fileCharset;
private Charset streamCharset;
private int maxIndent;
private char quoteChar;
@@ -88,7 +85,6 @@ public class WriterSerializerSession extends
SerializerSession {
*/
protected Builder(WriterSerializer ctx) {
super(assertArgNotNull(ARG_ctx, ctx));
- fileCharset = ctx.getFileCharset();
streamCharset = ctx.getStreamCharset();
useWhitespace = ctx.useWhitespace;
maxIndent = ctx.getMaxIndent();
@@ -100,29 +96,6 @@ public class WriterSerializerSession extends
SerializerSession {
return new WriterSerializerSession(this);
}
- /**
- * File charset.
- *
- * <p>
- * The character set to use for writing Files to the file
system.
- *
- * <p>
- * Used when passing in files to {@link
Serializer#serialize(Object, Object)}.
- *
- * <p>
- * If not specified, defaults to the JVM system default charset.
- *
- * @param value
- * The new property value.
- * <br>Can be <jk>null</jk> (value will not be set,
defaults to JVM system default charset).
- * @return This object.
- */
- public SELF fileCharset(Charset value) {
- if (nn(value))
- fileCharset = value;
- return self();
- }
-
/**
* Maximum indentation.
*
@@ -141,8 +114,6 @@ public class WriterSerializerSession extends
SerializerSession {
return self();
}
switch (key) {
- case PROP_fileCharset,
PROP_WriterSerializerSession_fileCharset:
- return fileCharset(cvt(value,
Charset.class));
case PROP_streamCharset,
PROP_WriterSerializerSession_streamCharset:
return streamCharset(cvt(value,
Charset.class));
case PROP_useWhitespace,
PROP_WriterSerializerSession_useWhitespace:
@@ -234,7 +205,6 @@ public class WriterSerializerSession extends
SerializerSession {
}
private final boolean useWhitespace;
- private final Charset fileCharset;
private final Charset streamCharset;
private final int maxIndent;
private final char quoteChar;
@@ -246,20 +216,12 @@ public class WriterSerializerSession extends
SerializerSession {
*/
protected WriterSerializerSession(Builder<?> builder) {
super(builder);
- fileCharset = builder.fileCharset;
streamCharset = builder.streamCharset;
useWhitespace = builder.useWhitespace;
maxIndent = builder.maxIndent;
quoteChar = builder.quoteChar;
}
- /**
- * Returns the file charset defined on this session.
- *
- * @return the file charset defined on this session.
- */
- public Charset getFileCharset() { return fileCharset; }
-
/**
* Returns the stream charset defined on this session.
*
@@ -328,7 +290,6 @@ public class WriterSerializerSession extends
SerializerSession {
@Override /* Overridden from SerializerSession */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a(PROP_fileCharset, fileCharset)
.a(PROP_streamCharset, streamCharset)
.a(PROP_useWhitespace, useWhitespace)
.a(PROP_maxIndent, maxIndent)
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/ContextSession_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/ContextSession_Test.java
index 06ea021dfb..c646a22da9 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/ContextSession_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/ContextSession_Test.java
@@ -234,21 +234,7 @@ class ContextSession_Test extends TestBase {
assertEquals("text/xml",
session.getMediaType().toString());
}
- // -- WriterSerializerSession: fileCharset, streamCharset,
useWhitespace --
-
- @Test void e10_writerSerializer_fileCharset_shortForm() {
- var session = (WriterSerializerSession)
JsonSerializer.DEFAULT.createSession()
- .property("fileCharset", "UTF-16")
- .build();
- assertEquals(Charset.forName("UTF-16"),
session.getFileCharset());
- }
-
- @Test void e11_writerSerializer_fileCharset_qualifiedForm() {
- var session = (WriterSerializerSession)
JsonSerializer.DEFAULT.createSession()
-
.property("WriterSerializerSession.fileCharset", Charset.forName("ISO-8859-1"))
- .build();
- assertEquals(Charset.forName("ISO-8859-1"),
session.getFileCharset());
- }
+ // -- WriterSerializerSession: streamCharset, useWhitespace --
@Test void e12_writerSerializer_streamCharset_shortForm() {
var session = (WriterSerializerSession)
JsonSerializer.DEFAULT.createSession()
@@ -264,14 +250,7 @@ class ContextSession_Test extends TestBase {
assertEquals(Charset.forName("ISO-8859-1"),
session.getStreamCharset());
}
- // -- ReaderParserSession: fileCharset, streamCharset --
-
- @Test void e14_readerParser_fileCharset_shortForm() {
- var session = (ReaderParserSession)
JsonParser.DEFAULT.createSession()
- .property("fileCharset", "UTF-16")
- .build();
- assertEquals(Charset.forName("UTF-16"),
session.getFileCharset());
- }
+ // -- ReaderParserSession: streamCharset --
@Test void e15_readerParser_streamCharset_qualifiedForm() {
var session = (ReaderParserSession)
JsonParser.DEFAULT.createSession()
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserConfigAnnotationTest.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserConfigAnnotationTest.java
index 47ef79af53..e5d4724e2b 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserConfigAnnotationTest.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserConfigAnnotationTest.java
@@ -19,7 +19,6 @@ package org.apache.juneau.marshall.parser;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import java.nio.charset.*;
import java.util.function.*;
import org.apache.juneau.*;
@@ -59,7 +58,6 @@ class ParserConfigAnnotationTest extends TestBase {
autoCloseStreams="$X{true}",
binaryFormat="$X{HEX}",
debugOutputLines="$X{1}",
- fileCharset="$X{US-ASCII}",
streamCharset="$X{US-ASCII}",
listener=AA.class,
trimStrings="$X{true}",
@@ -73,7 +71,6 @@ class ParserConfigAnnotationTest extends TestBase {
var x = JsonParser.create().apply(al).build().getSession();
check("true", x.isAutoCloseStreams());
check("1", x.getDebugOutputLines());
- check("US-ASCII", x.getFileCharset());
check("US-ASCII", x.getStreamCharset());
check("AA", x.getListener());
check("true", x.isTrimStrings());
@@ -104,7 +101,6 @@ class ParserConfigAnnotationTest extends TestBase {
var x = JsonParser.create().apply(al).build().getSession();
check("false", x.isAutoCloseStreams());
check("5", x.getDebugOutputLines());
- check(Charset.defaultCharset().toString(), x.getFileCharset());
check("UTF-8", x.getStreamCharset());
check(null, x.getListener());
check("false", x.isTrimStrings());
@@ -134,7 +130,6 @@ class ParserConfigAnnotationTest extends TestBase {
var x = JsonParser.create().apply(al).build().getSession();
check("false", x.isAutoCloseStreams());
check("5", x.getDebugOutputLines());
- check(Charset.defaultCharset().toString(), x.getFileCharset());
check("UTF-8", x.getStreamCharset());
check(null, x.getListener());
check("false", x.isTrimStrings());
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation_Test.java
index d7ca625ca1..77fc122ad8 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/serializer/SerializerConfigAnnotation_Test.java
@@ -234,7 +234,6 @@ class SerializerConfigAnnotation_Test extends TestBase {
}
@SerializerConfig(
- fileCharset="$X{UTF-8}",
streamCharset="$X{ISO-8859-1}"
)
static class E {}
@@ -243,12 +242,10 @@ class SerializerConfigAnnotation_Test extends TestBase {
@Test void d02_charsetWithNonDefaultValue() {
var al = AnnotationWorkList.of(sr, rstream(e.getAnnotations()));
var x = JsonSerializer.create().apply(al).build().getSession();
- check("UTF-8", x.getFileCharset().name());
check("ISO-8859-1", x.getStreamCharset().name());
}
@SerializerConfig(
- fileCharset="$X{default}",
streamCharset="$X{DEFAULT}"
)
static class E2 {}
@@ -257,7 +254,6 @@ class SerializerConfigAnnotation_Test extends TestBase {
@Test void d02b_charsetWithDefaultValue() {
var al = AnnotationWorkList.of(sr,
rstream(e2.getAnnotations()));
var x = JsonSerializer.create().apply(al).build().getSession();
- check(Charset.defaultCharset().name(),
x.getFileCharset().name());
check(Charset.defaultCharset().name(),
x.getStreamCharset().name());
}
