Skip to content
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

Fix split package in analysis-kuromoji plugin #78039

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Fix split package in analysis-kuromoji plugin #78039

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
13 changes: 0 additions & 13 deletions plugins/analysis-kuromoji/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,3 @@ restResources {
tasks.named("dependencyLicenses").configure {
mapping from: /lucene-.*/, to: 'lucene'
}

tasks.named('splitPackagesAudit').configure {
// o.e.i.analysis is owned by server, these should be moved to a kuromoji package
ignoreClasses 'org.elasticsearch.index.analysis.JapaneseStopTokenFilterFactory',
'org.elasticsearch.index.analysis.KuromojiAnalyzerProvider',
'org.elasticsearch.index.analysis.KuromojiBaseFormFilterFactory',
'org.elasticsearch.index.analysis.KuromojiIterationMarkCharFilterFactory',
'org.elasticsearch.index.analysis.KuromojiKatakanaStemmerFactory',
'org.elasticsearch.index.analysis.KuromojiNumberFilterFactory',
'org.elasticsearch.index.analysis.KuromojiPartOfSpeechFilterFactory',
'org.elasticsearch.index.analysis.KuromojiReadingFormFilterFactory',
'org.elasticsearch.index.analysis.KuromojiTokenizerFactory'
}
9 changes: 0 additions & 9 deletions ...moji/src/main/java/org/elasticsearch/plugin/analysis/kuromoji/AnalysisKuromojiPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.elasticsearch.index.analysis.AnalyzerProvider;
import org.elasticsearch.index.analysis.CharFilterFactory;
import org.elasticsearch.index.analysis.JapaneseStopTokenFilterFactory;
import org.elasticsearch.index.analysis.KuromojiAnalyzerProvider;
import org.elasticsearch.index.analysis.KuromojiBaseFormFilterFactory;
import org.elasticsearch.index.analysis.KuromojiIterationMarkCharFilterFactory;
import org.elasticsearch.index.analysis.KuromojiKatakanaStemmerFactory;
import org.elasticsearch.index.analysis.KuromojiNumberFilterFactory;
import org.elasticsearch.index.analysis.KuromojiPartOfSpeechFilterFactory;
import org.elasticsearch.index.analysis.KuromojiReadingFormFilterFactory;
import org.elasticsearch.index.analysis.KuromojiTokenizerFactory;
import org.elasticsearch.index.analysis.TokenFilterFactory;
import org.elasticsearch.index.analysis.TokenizerFactory;
import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
Expand Down
6 changes: 4 additions & 2 deletions ...lysis/JapaneseStopTokenFilterFactory.java → ...omoji/JapaneseStopTokenFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;


import org.apache.lucene.analysis.CharArraySet;
Expand All @@ -17,13 +17,15 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
import org.elasticsearch.index.analysis.Analysis;

import java.util.Map;
import java.util.Set;

import static java.util.Collections.singletonMap;

public class JapaneseStopTokenFilterFactory extends AbstractTokenFilterFactory{
public class JapaneseStopTokenFilterFactory extends AbstractTokenFilterFactory {
private static final Map<String, Set<?>> NAMED_STOP_WORDS = singletonMap("_japanese_", JapaneseAnalyzer.getDefaultStopSet());

private final CharArraySet stopWords;
Expand Down
4 changes: 3 additions & 1 deletion ...ex/analysis/KuromojiAnalyzerProvider.java → ...is/kuromoji/KuromojiAnalyzerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.ja.JapaneseAnalyzer;
Expand All @@ -15,6 +15,8 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
import org.elasticsearch.index.analysis.Analysis;

import java.util.Set;

Expand Down
3 changes: 2 additions & 1 deletion ...alysis/KuromojiBaseFormFilterFactory.java → ...romoji/KuromojiBaseFormFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseBaseFormFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;

public class KuromojiBaseFormFilterFactory extends AbstractTokenFilterFactory {

Expand Down
4 changes: 3 additions & 1 deletion ...romojiIterationMarkCharFilterFactory.java → ...romojiIterationMarkCharFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractCharFilterFactory;
import org.elasticsearch.index.analysis.NormalizingCharFilterFactory;

import java.io.Reader;

Expand Down
3 changes: 2 additions & 1 deletion ...lysis/KuromojiKatakanaStemmerFactory.java → ...omoji/KuromojiKatakanaStemmerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;

public class KuromojiKatakanaStemmerFactory extends AbstractTokenFilterFactory {

Expand Down
3 changes: 2 additions & 1 deletion ...analysis/KuromojiNumberFilterFactory.java → ...kuromoji/KuromojiNumberFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseNumberFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;

public class KuromojiNumberFilterFactory extends AbstractTokenFilterFactory {

Expand Down
4 changes: 3 additions & 1 deletion ...is/KuromojiPartOfSpeechFilterFactory.java → ...ji/KuromojiPartOfSpeechFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseAnalyzer;
import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
import org.elasticsearch.index.analysis.Analysis;

import java.util.HashSet;
import java.util.List;
Expand Down
3 changes: 2 additions & 1 deletion ...sis/KuromojiReadingFormFilterFactory.java → ...oji/KuromojiReadingFormFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseReadingFormFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;

public class KuromojiReadingFormFilterFactory extends AbstractTokenFilterFactory {

Expand Down
4 changes: 3 additions & 1 deletion ...ex/analysis/KuromojiTokenizerFactory.java → ...is/kuromoji/KuromojiTokenizerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ja.JapaneseTokenizer;
Expand All @@ -17,6 +17,8 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenizerFactory;
import org.elasticsearch.index.analysis.Analysis;

import java.io.IOException;
import java.io.StringReader;
Expand Down
8 changes: 7 additions & 1 deletion ...nalysis/AnalysisKuromojiFactoryTests.java → ...uromoji/AnalysisKuromojiFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,17 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.ja.JapaneseTokenizerFactory;
import org.elasticsearch.indices.analysis.AnalysisFactoryTestCase;
import org.elasticsearch.plugin.analysis.kuromoji.AnalysisKuromojiPlugin;
import org.elasticsearch.plugin.analysis.kuromoji.KuromojiBaseFormFilterFactory;
import org.elasticsearch.plugin.analysis.kuromoji.KuromojiIterationMarkCharFilterFactory;
import org.elasticsearch.plugin.analysis.kuromoji.KuromojiKatakanaStemmerFactory;
import org.elasticsearch.plugin.analysis.kuromoji.KuromojiNumberFilterFactory;
import org.elasticsearch.plugin.analysis.kuromoji.KuromojiPartOfSpeechFilterFactory;
import org.elasticsearch.plugin.analysis.kuromoji.KuromojiReadingFormFilterFactory;

import java.util.HashMap;
import java.util.Map;
Expand Down
14 changes: 10 additions & 4 deletions ...index/analysis/KuromojiAnalysisTests.java → ...lysis/kuromoji/KuromojiAnalysisTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.index.analysis;
package org.elasticsearch.plugin.analysis.kuromoji;

import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
Expand All @@ -19,7 +19,13 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index;
import org.elasticsearch.plugin.analysis.kuromoji.AnalysisKuromojiPlugin;
import org.elasticsearch.index.analysis.AnalysisTestsHelper;
import org.elasticsearch.index.analysis.CharFilterFactory;
import org.elasticsearch.index.analysis.CustomAnalyzer;
import org.elasticsearch.index.analysis.IndexAnalyzers;
import org.elasticsearch.index.analysis.NamedAnalyzer;
import org.elasticsearch.index.analysis.TokenFilterFactory;
import org.elasticsearch.index.analysis.TokenizerFactory;
import org.elasticsearch.test.ESTestCase;

import java.io.IOException;
Expand Down Expand Up @@ -69,7 +75,7 @@ public void testDefaultsKuromojiAnalysis() throws IOException {
assertThat(analyzer.analyzer(), instanceOf(CustomAnalyzer.class));
assertThat(analyzer.analyzer().tokenStream(null, new StringReader("")), instanceOf(JapaneseTokenizer.class));

CharFilterFactory charFilterFactory = analysis.charFilter.get("kuromoji_iteration_mark");
CharFilterFactory charFilterFactory = analysis.charFilter.get("kuromoji_iteration_mark");
assertThat(charFilterFactory, instanceOf(KuromojiIterationMarkCharFilterFactory.class));

}
Expand Down Expand Up @@ -199,7 +205,7 @@ private static TestAnalysis createTestAnalysis() throws IOException {
Files.createDirectory(config);
Files.copy(empty_dict, config.resolve("empty_user_dict.txt"));
Files.copy(dict, config.resolve("user_dict.txt"));
String json = "/org/elasticsearch/index/analysis/kuromoji_analysis.json";
String json = "/org/elasticsearch/plugin/analysis/kuromoji/kuromoji_analysis.json";

Settings settings = Settings.builder()
.loadFromStream(json, KuromojiAnalysisTests.class.getResourceAsStream(json), false)
Expand Down
0 ...search/index/analysis/empty_user_dict.txt → ...gin/analysis/kuromoji/empty_user_dict.txt
View file
Open in desktop
File renamed without changes.
0 ...rch/index/analysis/kuromoji_analysis.json → .../analysis/kuromoji/kuromoji_analysis.json
View file
Open in desktop
File renamed without changes.
0 ...lasticsearch/index/analysis/user_dict.txt → ...ch/plugin/analysis/kuromoji/user_dict.txt
View file
Open in desktop
File renamed without changes.