Can not upgrade kuromoji plugin from elasticsearch 0.90.5

Due to fix [3790](https://github.com/elasticsearch/elasticsearch/issues/3790) in core, upgrading an analyzer provided as a plugin now fails.

See https://github.com/elasticsearch/elasticsearch/issues/5030 for details.

Issue is in elasticsearch core code but can be fixed in plugins by overloading `PreBuiltAnalyzerProviderFactory`,  `PreBuiltTokenFilterFactoryFactory`, `PreBuiltTokenizerFactoryFactory` or `PreBuiltCharFilterFactoryFactory ` when used.

Closes #21
(cherry picked from commit 3401c21)
This commit is contained in:
David Pilato 2014-02-28 23:47:50 +01:00
parent bcbd107daf
commit dfcfe7e894
4 changed files with 120 additions and 6 deletions

View File

@ -43,7 +43,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
super(settings); super(settings);
indicesAnalysisService.charFilterFactories().put("kuromoji_iteration_mark", indicesAnalysisService.charFilterFactories().put("kuromoji_iteration_mark",
new PreBuiltCharFilterFactoryFactory(new CharFilterFactory() { new KurumojiCharFilterFactoryFactory(new CharFilterFactory() {
@Override @Override
public String name() { public String name() {
return "kuromoji_iteration_mark"; return "kuromoji_iteration_mark";
@ -58,7 +58,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
})); }));
indicesAnalysisService.tokenizerFactories().put("kuromoji_tokenizer", indicesAnalysisService.tokenizerFactories().put("kuromoji_tokenizer",
new PreBuiltTokenizerFactoryFactory(new TokenizerFactory() { new KurumojiTokenizerFactoryFactory(new TokenizerFactory() {
@Override @Override
public String name() { public String name() {
return "kuromoji_tokenizer"; return "kuromoji_tokenizer";
@ -72,7 +72,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
})); }));
indicesAnalysisService.tokenFilterFactories().put("kuromoji_baseform", indicesAnalysisService.tokenFilterFactories().put("kuromoji_baseform",
new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() { new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
@Override @Override
public String name() { public String name() {
return "kuromoji_baseform"; return "kuromoji_baseform";
@ -86,7 +86,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
indicesAnalysisService.tokenFilterFactories().put( indicesAnalysisService.tokenFilterFactories().put(
"kuromoji_part_of_speech", "kuromoji_part_of_speech",
new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() { new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
@Override @Override
public String name() { public String name() {
return "kuromoji_part_of_speech"; return "kuromoji_part_of_speech";
@ -102,7 +102,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
indicesAnalysisService.tokenFilterFactories().put( indicesAnalysisService.tokenFilterFactories().put(
"kuromoji_readingform", "kuromoji_readingform",
new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() { new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
@Override @Override
public String name() { public String name() {
return "kuromoji_readingform"; return "kuromoji_readingform";
@ -115,7 +115,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
})); }));
indicesAnalysisService.tokenFilterFactories().put("kuromoji_stemmer", indicesAnalysisService.tokenFilterFactories().put("kuromoji_stemmer",
new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() { new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
@Override @Override
public String name() { public String name() {
return "kuromoji_stemmer"; return "kuromoji_stemmer";

View File

@ -0,0 +1,38 @@
/*
* Licensed to Elasticsearch (the "Author") under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Author licenses this
* file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.indices.analysis;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.analysis.CharFilterFactory;
import org.elasticsearch.index.analysis.PreBuiltCharFilterFactoryFactory;
public class KurumojiCharFilterFactoryFactory extends PreBuiltCharFilterFactoryFactory {
private final CharFilterFactory charFilterFactory;
public KurumojiCharFilterFactoryFactory(CharFilterFactory charFilterFactory) {
super(charFilterFactory);
this.charFilterFactory = charFilterFactory;
}
@Override
public CharFilterFactory create(String name, Settings settings) {
return charFilterFactory;
}
}

View File

@ -0,0 +1,38 @@
/*
* Licensed to Elasticsearch (the "Author") under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Author licenses this
* file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.indices.analysis;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.analysis.PreBuiltTokenFilterFactoryFactory;
import org.elasticsearch.index.analysis.TokenFilterFactory;
public class KurumojiTokenFilterFactoryFactory extends PreBuiltTokenFilterFactoryFactory {
private final TokenFilterFactory tokenFilterFactory;
public KurumojiTokenFilterFactoryFactory(TokenFilterFactory tokenFilterFactory) {
super(tokenFilterFactory);
this.tokenFilterFactory = tokenFilterFactory;
}
@Override
public TokenFilterFactory create(String name, Settings settings) {
return tokenFilterFactory;
}
}

View File

@ -0,0 +1,38 @@
/*
* Licensed to Elasticsearch (the "Author") under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Author licenses this
* file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.indices.analysis;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.analysis.PreBuiltTokenizerFactoryFactory;
import org.elasticsearch.index.analysis.TokenizerFactory;
public class KurumojiTokenizerFactoryFactory extends PreBuiltTokenizerFactoryFactory {
private final TokenizerFactory tokenizerFactory;
public KurumojiTokenizerFactoryFactory(TokenizerFactory tokenizerFactory) {
super(tokenizerFactory);
this.tokenizerFactory = tokenizerFactory;
}
@Override
public TokenizerFactory create(String name, Settings settings) {
return tokenizerFactory;
}
}