Modify default encoding detector

Replace HtmlEncodingDetector to StandardHtmlEncodingDetector Adjust some test case
apache · Dec 5, 2020 · 99eaa8a · 99eaa8a
1 parent 0e7b475
commit 99eaa8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector b/...-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
@@ -0,0 +1 @@
+org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector
diff --git a/...arsers-classic-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java b/...arsers-classic-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
@@ -43,6 +43,7 @@
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.ParserDecorator;
 import org.apache.tika.parser.html.HtmlEncodingDetector;
+import org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector;
 import org.apache.tika.parser.txt.Icu4jEncodingDetector;
 import org.apache.tika.parser.txt.TXTParser;
 import org.apache.tika.parser.txt.UniversalEncodingDetector;
@@ -56,7 +57,7 @@ public void testDefault() {
         assertTrue(detector instanceof CompositeEncodingDetector);
         List<EncodingDetector> detectors = ((CompositeEncodingDetector) detector).getDetectors();
         assertEquals(3, detectors.size());
-        assertTrue(detectors.get(0) instanceof HtmlEncodingDetector);
+        assertTrue(detectors.get(0) instanceof StandardHtmlEncodingDetector);
         assertTrue(detectors.get(1) instanceof UniversalEncodingDetector);
         assertTrue(detectors.get(2) instanceof Icu4jEncodingDetector);
     }

diff --git a/...src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml b/...src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
@@ -19,9 +19,9 @@
     <!-- Explicitly request default parsers -->
     <parsers/>
     <encodingDetectors>
-        <!-- All detectors except HtmlEncodingDetector -->
+        <!-- All detectors except StandardHtmlEncodingDetector -->
         <encodingDetector class="org.apache.tika.detect.DefaultEncodingDetector">
-            <encodingDetector-exclude class="org.apache.tika.parser.html.HtmlEncodingDetector"/>
+            <encodingDetector-exclude class="org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector"/>
         </encodingDetector>
         <!-- One other detector, to check ordering -->
         <encodingDetector class="org.apache.tika.detect.NonDetectingEncodingDetector"/>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector