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

HTTPCLIENT-2300: abstract char message consumers to use UTF-8 by default if a charset has not been explicitly specified by the Content-Type

This commit is contained in:
Oleg Kalnichevski 2023-09-24 09:47:53 +02:00
parent 11c7af28c4
commit 6d1aafaf87
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharPushConsumer.java
View File

@ -37,6 +37,7 @@ import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.config.CharCodingConfig;
import org.apache.hc.core5.http.nio.AsyncPushConsumer;
import org.apache.hc.core5.http.nio.entity.AbstractCharDataConsumer;
import org.apache.hc.core5.http.protocol.HttpContext;
@ -48,6 +49,19 @@ import org.apache.hc.core5.http.protocol.HttpContext;
*/
public abstract class AbstractCharPushConsumer extends AbstractCharDataConsumer implements AsyncPushConsumer {
private final Charset defaultCharset;
public AbstractCharPushConsumer() {
this.defaultCharset = StandardCharsets.UTF_8;
}
protected AbstractCharPushConsumer(final int bufSize,
final CharCodingConfig charCodingConfig) {
super(bufSize, charCodingConfig);
this.defaultCharset = charCodingConfig != null && charCodingConfig.getCharset() != null
? charCodingConfig.getCharset() : StandardCharsets.UTF_8;
}
/**
* Triggered to signal the beginning of data processing.
*
@ -72,7 +86,7 @@ public abstract class AbstractCharPushConsumer extends AbstractCharDataConsumer
}
Charset charset = contentType != null ? contentType.getCharset() : null;
if (charset == null) {
charset = StandardCharsets.US_ASCII;
charset = defaultCharset;
}
setCharset(charset);
start(promise, response, contentType != null ? contentType : ContentType.DEFAULT_TEXT);

15
httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharResponseConsumer.java
View File

@ -37,6 +37,7 @@ import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.config.CharCodingConfig;
import org.apache.hc.core5.http.nio.AsyncResponseConsumer;
import org.apache.hc.core5.http.nio.entity.AbstractCharDataConsumer;
import org.apache.hc.core5.http.protocol.HttpContext;
@ -51,6 +52,18 @@ import org.apache.hc.core5.http.protocol.HttpContext;
public abstract class AbstractCharResponseConsumer<T> extends AbstractCharDataConsumer implements AsyncResponseConsumer<T> {
private volatile FutureCallback<T> resultCallback;
private final Charset defaultCharset;
public AbstractCharResponseConsumer() {
this.defaultCharset = StandardCharsets.UTF_8;
}
protected AbstractCharResponseConsumer(final int bufSize,
final CharCodingConfig charCodingConfig) {
super(bufSize, charCodingConfig);
this.defaultCharset = charCodingConfig != null && charCodingConfig.getCharset() != null
? charCodingConfig.getCharset() : StandardCharsets.UTF_8;
}
/**
* Triggered to signal the beginning of data processing.
@ -90,7 +103,7 @@ public abstract class AbstractCharResponseConsumer<T> extends AbstractCharDataCo
}
Charset charset = contentType != null ? contentType.getCharset() : null;
if (charset == null) {
charset = StandardCharsets.US_ASCII;
charset = defaultCharset;
}
setCharset(charset);
start(response, contentType != null ? contentType : ContentType.DEFAULT_TEXT);