Skip to content

Commit a0c8b8a

Browse files
authored
SOLR-17960 Remove deprecated TikaLanguageIdentifierUpdateProcessor (#3787)
1 parent 5e210f9 commit a0c8b8a

File tree

13 files changed

+10
-410
lines changed

13 files changed

+10
-410
lines changed

solr/CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ Dependency Upgrades
263263
Other Changes
264264
---------------------
265265

266+
* SOLR-17960: Removed TikaLanguageIdentifierUpdateProcessor. Use LangDetectLanguageIdentifierUpdateProcessor
267+
or OpenNLPLangDetectUpdateProcessor instead. (janhoy)
268+
266269
* SOLR-15730: SolrJ modules like SolrJ-Zookeeper are now opt-in from a Maven POM perspective.
267270
Previously, the modules would come transitively.
268271
(David Smiley)

solr/modules/langid/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,5 @@ for more information.
3535

3636
Dependencies
3737
------------
38-
The Tika detector depends on Tika Core (which is part of the extraction module)
3938
The Langdetect detector depends on LangDetect library
4039
The OpenNLP detector depends on OpenNLP tools and requires a previously trained user-supplied model

solr/modules/langid/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies {
2323
implementation project(':solr:core')
2424
implementation project(':solr:solrj')
2525

26-
implementation(libs.apache.tika.core) { transitive = false }
2726
implementation libs.commonsio.commonsio
2827
implementation libs.cybozulabs.langdetect
2928
implementation libs.apache.opennlp.tools

solr/modules/langid/gradle.lockfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ org.apache.lucene:lucene-spatial3d:10.3.1=jarValidation,runtimeClasspath,runtime
116116
org.apache.lucene:lucene-suggest:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
117117
org.apache.lucene:lucene-test-framework:10.3.1=jarValidation,testCompileClasspath,testRuntimeClasspath
118118
org.apache.opennlp:opennlp-tools:2.5.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
119-
org.apache.tika:tika-core:1.28.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
120119
org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
121120
org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
122121
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath

solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,10 @@
5656

5757
<requestHandler name="/update" class="solr.UpdateRequestHandler" >
5858
<lst name="defaults">
59-
<str name="update.chain">lang_id_tika</str>
59+
<str name="update.chain">lang_id_lang_detect</str>
6060
</lst>
6161
</requestHandler>
6262

63-
<updateRequestProcessorChain name="lang_id_tika">
64-
<processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
65-
<!-- Can take defaults, invariants and appends just like req handlers-->
66-
<lst name="defaults">
67-
<bool name="langid">true</bool>
68-
<str name="langid.fl">name,subject</str>
69-
<bool name="langid.map">true</bool>
70-
<str name="langid.langField">language_s</str>
71-
<str name="langid.langsField">language_sm</str>
72-
<str name="langid.map.lcmap">th:thai</str>
73-
<float name="threshold">0.5</float>
74-
<str name="langid.fallback">fallback</str>
75-
</lst>
76-
</processor>
77-
<processor class="solr.RunUpdateProcessorFactory" />
78-
</updateRequestProcessorChain>
79-
8063
<updateRequestProcessorChain name="lang_id_lang_detect">
8164
<processor class="org.apache.solr.update.processor.LangDetectLanguageIdentifierUpdateProcessorFactory">
8265
<!-- Can take defaults, invariants and appends just like req handlers-->

solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ public abstract class LanguageIdentifierUpdateProcessorFactoryTestCase extends S
3939
public static void beforeClass() throws Exception {
4040
initCore("solrconfig-languageidentifier.xml", "schema.xml", getFile("langid/solr"));
4141
SolrCore core = h.getCore();
42-
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("lang_id_tika");
43-
assertNotNull(chained);
44-
chained = core.getUpdateProcessingChain("lang_id_lang_detect");
42+
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("lang_id_lang_detect");
4543
assertNotNull(chained);
4644
chained = core.getUpdateProcessingChain("lang_id_opennlp");
4745
assertNotNull(chained);

0 commit comments

Comments
 (0)