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-nori plugin #78040

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Fix split package in analysis-nori plugin #78040

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

tasks.named('splitPackagesAudit').configure {
// Lucene packages should be owned by Lucene!
ignoreClasses 'org.elasticsearch.index.analysis.NoriAnalyzerProvider',
'org.elasticsearch.index.analysis.NoriNumberFilterFactory',
'org.elasticsearch.index.analysis.NoriPartOfSpeechStopFilterFactory',
'org.elasticsearch.index.analysis.NoriReadingFormFilterFactory',
'org.elasticsearch.index.analysis.NoriTokenizerFactory'
}
5 changes: 0 additions & 5 deletions ...nalysis-nori/src/main/java/org/elasticsearch/plugin/analysis/nori/AnalysisNoriPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@

import org.apache.lucene.analysis.Analyzer;
import org.elasticsearch.index.analysis.AnalyzerProvider;
import org.elasticsearch.index.analysis.NoriAnalyzerProvider;
import org.elasticsearch.index.analysis.NoriNumberFilterFactory;
import org.elasticsearch.index.analysis.NoriPartOfSpeechStopFilterFactory;
import org.elasticsearch.index.analysis.NoriReadingFormFilterFactory;
import org.elasticsearch.index.analysis.NoriTokenizerFactory;
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 .../index/analysis/NoriAnalyzerProvider.java → ...n/analysis/nori/NoriAnalyzerProvider.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.nori;

import java.util.List;
import java.util.Set;
Expand All @@ -18,8 +18,10 @@
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 static org.elasticsearch.index.analysis.NoriPartOfSpeechStopFilterFactory.resolvePOSList;
import static org.elasticsearch.plugin.analysis.nori.NoriPartOfSpeechStopFilterFactory.resolvePOSList;


public class NoriAnalyzerProvider extends AbstractIndexAnalyzerProvider<KoreanAnalyzer> {
Expand Down
3 changes: 2 additions & 1 deletion ...dex/analysis/NoriNumberFilterFactory.java → ...nalysis/nori/NoriNumberFilterFactory.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.nori;

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

public class NoriNumberFilterFactory extends AbstractTokenFilterFactory {

Expand Down
4 changes: 3 additions & 1 deletion ...is/NoriPartOfSpeechStopFilterFactory.java → ...ri/NoriPartOfSpeechStopFilterFactory.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.nori;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ko.KoreanPartOfSpeechStopFilter;
import org.apache.lucene.analysis.ko.POS;
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 ...nalysis/NoriReadingFormFilterFactory.java → ...is/nori/NoriReadingFormFilterFactory.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.nori;

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

public class NoriReadingFormFilterFactory extends AbstractTokenFilterFactory {
public NoriReadingFormFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
Expand Down
4 changes: 3 additions & 1 deletion .../index/analysis/NoriTokenizerFactory.java → ...n/analysis/nori/NoriTokenizerFactory.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.nori;

import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ko.KoreanTokenizer;
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.AbstractTokenizerFactory;
import org.elasticsearch.index.analysis.Analysis;

import java.io.IOException;
import java.io.Reader;
Expand Down
5 changes: 4 additions & 1 deletion ...ex/analysis/AnalysisNoriFactoryTests.java → ...alysis/nori/AnalysisNoriFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
* Side Public License, v 1.
*/

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

import org.apache.lucene.analysis.ko.KoreanTokenizerFactory;
import org.elasticsearch.indices.analysis.AnalysisFactoryTestCase;
import org.elasticsearch.plugin.analysis.nori.AnalysisNoriPlugin;
import org.elasticsearch.plugin.analysis.nori.NoriNumberFilterFactory;
import org.elasticsearch.plugin.analysis.nori.NoriPartOfSpeechStopFilterFactory;
import org.elasticsearch.plugin.analysis.nori.NoriReadingFormFilterFactory;

import java.util.HashMap;
import java.util.Map;
Expand Down
8 changes: 6 additions & 2 deletions ...rch/index/analysis/NoriAnalysisTests.java → ...ugin/analysis/nori/NoriAnalysisTests.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.nori;

import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
Expand All @@ -17,7 +17,11 @@
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.plugin.analysis.nori.AnalysisNoriPlugin;
import org.elasticsearch.index.analysis.AnalysisTestsHelper;
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.TestAnalysis;
import org.elasticsearch.test.ESTokenStreamTestCase;

Expand Down
0 ...lasticsearch/index/analysis/user_dict.txt → ...search/plugin/analysis/nori/user_dict.txt
View file
Open in desktop
File renamed without changes.