Skip to content

TIKA-4683 -- charset detector dep mgmt and order in AutoDetectReader #2800

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

Merged
tballison merged 1 commit into from
May 2, 2026
+21 −4
Merged

TIKA-4683 -- charset detector dep mgmt and order in AutoDetectReader #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions tika-core/src/main/java/org/apache/tika/detect/AutoDetectReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ public class AutoDetectReader extends BufferedReader {
private static final EncodingDetector DEFAULT_DETECTOR;

static {
DEFAULT_DETECTOR = new CompositeEncodingDetector(
DEFAULT_LOADER.loadServiceProviders(EncodingDetector.class));
// Use DefaultEncodingDetector so SPI-discovered detectors are run in the
// pinned order (HtmlEncodingDetector, UniversalEncodingDetector, Icu4jEncodingDetector,
// then anything else by class name). Otherwise the order would be whatever
// ServiceLoader yields from classpath/jar order, which is fragile.
DEFAULT_DETECTOR = new DefaultEncodingDetector(DEFAULT_LOADER);
}

private final Charset charset;
Expand Down Expand Up @@ -79,8 +82,7 @@ private AutoDetectReader(TikaInputStream tis, Metadata metadata,

public AutoDetectReader(InputStream stream, Metadata metadata, ServiceLoader loader)
throws IOException, TikaException {
this(getTikaInputStream(stream), metadata,
new CompositeEncodingDetector(loader.loadServiceProviders(EncodingDetector.class)));
this(getTikaInputStream(stream), metadata, new DefaultEncodingDetector(loader));
}

public AutoDetectReader(InputStream stream, Metadata metadata)
Expand Down
15 changes: 15 additions & 0 deletions tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@
<artifactId>tika-parser-digest-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-encoding-detector-html</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-encoding-detector-icu4j</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-encoding-detector-universal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-parser-font-module</artifactId>
Expand Down
Loading