Skip to content

Commit 07a57cc

Browse files
authored
Move number of language analyzers to analysis-common module (#31143)
The following analyzers were moved from server module to analysis-common module: `snowball`, `arabic`, `armenian`, `basque`, `bengali`, `brazilian`, `bulgarian`, `catalan`, `chinese`, `cjk`, `czech`, `danish`, `dutch`, `english`, `finnish`, `french`, `galician` and `german`. Relates to #23658
1 parent 435a825 commit 07a57cc

File tree

38 files changed

+952
-348
lines changed

38 files changed

+952
-348
lines changed

server/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.ar.ArabicAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class ArabicAnalyzerProvider extends AbstractIndexAnalyzerProvider<ArabicAnalyzer> {
2931

3032
private final ArabicAnalyzer arabicAnalyzer;
3133

32-
public ArabicAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
ArabicAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
arabicAnalyzer = new ArabicAnalyzer(
3537
Analysis.parseStopWords(env, settings, ArabicAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArmenianAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.hy.ArmenianAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class ArmenianAnalyzerProvider extends AbstractIndexAnalyzerProvider<ArmenianAnalyzer> {
2931

3032
private final ArmenianAnalyzer analyzer;
3133

32-
public ArmenianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
ArmenianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
analyzer = new ArmenianAnalyzer(
3537
Analysis.parseStopWords(env, settings, ArmenianAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BasqueAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.eu.BasqueAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class BasqueAnalyzerProvider extends AbstractIndexAnalyzerProvider<BasqueAnalyzer> {
2931

3032
private final BasqueAnalyzer analyzer;
3133

32-
public BasqueAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
BasqueAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
analyzer = new BasqueAnalyzer(
3537
Analysis.parseStopWords(env, settings, BasqueAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.bn.BengaliAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class BengaliAnalyzerProvider extends AbstractIndexAnalyzerProvider<BengaliAnalyzer> {
2931

3032
private final BengaliAnalyzer analyzer;
3133

32-
public BengaliAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
BengaliAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
analyzer = new BengaliAnalyzer(
3537
Analysis.parseStopWords(env, settings, BengaliAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.br.BrazilianAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class BrazilianAnalyzerProvider extends AbstractIndexAnalyzerProvider<BrazilianAnalyzer> {
2931

3032
private final BrazilianAnalyzer analyzer;
3133

32-
public BrazilianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
BrazilianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
analyzer = new BrazilianAnalyzer(
3537
Analysis.parseStopWords(env, settings, BrazilianAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BulgarianAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.bg.BulgarianAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class BulgarianAnalyzerProvider extends AbstractIndexAnalyzerProvider<BulgarianAnalyzer> {
2931

3032
private final BulgarianAnalyzer analyzer;
3133

32-
public BulgarianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
BulgarianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
analyzer = new BulgarianAnalyzer(
3537
Analysis.parseStopWords(env, settings, BulgarianAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CatalanAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.ca.CatalanAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class CatalanAnalyzerProvider extends AbstractIndexAnalyzerProvider<CatalanAnalyzer> {
2931

3032
private final CatalanAnalyzer analyzer;
3133

32-
public CatalanAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
CatalanAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
analyzer = new CatalanAnalyzer(
3537
Analysis.parseStopWords(env, settings, CatalanAnalyzer.getDefaultStopSet()),

server/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ChineseAnalyzerProvider.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.standard.StandardAnalyzer;
2323
import org.elasticsearch.common.settings.Settings;
2424
import org.elasticsearch.env.Environment;
2525
import org.elasticsearch.index.IndexSettings;
26+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
2627

2728
/**
2829
* Only for old indexes
@@ -31,16 +32,16 @@ public class ChineseAnalyzerProvider extends AbstractIndexAnalyzerProvider<Stand
3132

3233
private final StandardAnalyzer analyzer;
3334

34-
public ChineseAnalyzerProvider(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
35+
ChineseAnalyzerProvider(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
3536
super(indexSettings, name, settings);
3637
// old index: best effort
3738
analyzer = new StandardAnalyzer();
3839
analyzer.setVersion(version);
39-
40+
4041
}
4142

4243
@Override
4344
public StandardAnalyzer get() {
4445
return this.analyzer;
4546
}
46-
}
47+
}

server/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java renamed to modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CjkAnalyzerProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.index.analysis;
20+
package org.elasticsearch.analysis.common;
2121

2222
import org.apache.lucene.analysis.CharArraySet;
2323
import org.apache.lucene.analysis.cjk.CJKAnalyzer;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
27+
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
28+
import org.elasticsearch.index.analysis.Analysis;
2729

2830
public class CjkAnalyzerProvider extends AbstractIndexAnalyzerProvider<CJKAnalyzer> {
2931

3032
private final CJKAnalyzer analyzer;
3133

32-
public CjkAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
34+
CjkAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
3335
super(indexSettings, name, settings);
3436
CharArraySet stopWords = Analysis.parseStopWords(env, settings, CJKAnalyzer.getDefaultStopSet());
3537

0 commit comments

Comments
 (0)