diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 70bad91..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 43fafe3..f736344 100644 --- a/.gitignore +++ b/.gitignore @@ -36,5 +36,5 @@ bin/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* - +.DS_Store secret.properties \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8d1c019..1ef2125 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ group 'org.openkoreantext' -version '6.5.2.0' +version '7.5.1.0' apply plugin: 'java' apply plugin: 'maven' apply plugin: 'signing' apply plugin: 'jacoco' +apply plugin: 'idea' sourceCompatibility = 1.8 @@ -20,7 +21,7 @@ configurations { } ext { - elasticsearchVersion = '6.5.2' + elasticsearchVersion = '7.5.1' openKoreanTextVersion = '2.1.0' } @@ -42,7 +43,7 @@ task makePluginDescriptor(type: Copy) { 'name': 'elasticsearch-analysis-openkoreantext', 'classname': 'org.elasticsearch.plugin.analysis.openkoreantext.AnalysisOpenKoreanTextPlugin', 'description': 'Korean analysis plugin integrates open-korean-text module into elasticsearch.', - 'version': '1.0.0', + 'version': '7.5.1', 'javaVersion': sourceCompatibility, 'elasticsearchVersion' : elasticsearchVersion ] @@ -110,4 +111,4 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { task wrapper(type: Wrapper) { gradleVersion = '3.4' -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextNormalizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextNormalizerFactory.java index b3ecb5d..dfad5d1 100644 --- a/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextNormalizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextNormalizerFactory.java @@ -12,7 +12,7 @@ /** * A ES character-filter factory for {@link OpenKoreanTextNormalizer}. */ -public class OpenKoreanTextNormalizerFactory extends AbstractCharFilterFactory implements MultiTermAwareComponent { +public class OpenKoreanTextNormalizerFactory extends AbstractCharFilterFactory { public OpenKoreanTextNormalizerFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) { super(indexSettings, name); @@ -23,10 +23,6 @@ public Reader create(Reader reader) { return new OpenKoreanTextNormalizer(reader); } - @Override - public Object getMultiTermComponent() { - return this; - } public static class OpenKoreanTextStemmerFactory extends AbstractTokenFilterFactory { public OpenKoreanTextStemmerFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) { diff --git a/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextTokenizerFactory.java index 28747e9..e73b348 100644 --- a/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/OpenKoreanTextTokenizerFactory.java @@ -13,7 +13,7 @@ public class OpenKoreanTextTokenizerFactory extends AbstractTokenizerFactory { public OpenKoreanTextTokenizerFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) { - super(indexSettings, name, settings); + super(indexSettings, settings, name); UserDictionaryLoader.loadDefaultUserDictionaries(); }