Skip to content

Commit 88c9d78

Browse files
committed
es 8.12.0 support
1 parent 604fd89 commit 88c9d78

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.ansj</groupId>
66
<artifactId>elasticsearch-analysis-ansj</artifactId>
7-
<version>8.11.4.0</version>
7+
<version>8.12.0.0</version>
88
<description>elasticsearch analysis by ansj</description>
99
<name>elasticsearch-analysis-ansj</name>
1010
<url>http://maven.nlpcn.org</url>
@@ -14,7 +14,7 @@
1414
<runSuite>**/MainTestSuite.class</runSuite>
1515
<elasticsearch.plugin.name>elasticsearch-analysis-ansj</elasticsearch.plugin.name>
1616
<elasticsearch.plugin.java.version>17</elasticsearch.plugin.java.version>
17-
<elasticsearch.version>8.11.4</elasticsearch.version>
17+
<elasticsearch.version>8.12.0</elasticsearch.version>
1818
<elasticsearch.plugin.classname>org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin</elasticsearch.plugin.classname>
1919
</properties>
2020

src/main/java/org/ansj/elasticsearch/plugin/AnalysisAnsjPlugin.java

+2-15
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,20 @@
1414
import org.apache.lucene.analysis.Analyzer;
1515
import org.elasticsearch.action.ActionRequest;
1616
import org.elasticsearch.action.ActionResponse;
17-
import org.elasticsearch.client.internal.Client;
1817
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1918
import org.elasticsearch.cluster.node.DiscoveryNodes;
20-
import org.elasticsearch.cluster.routing.allocation.AllocationService;
21-
import org.elasticsearch.cluster.service.ClusterService;
22-
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
2319
import org.elasticsearch.common.settings.ClusterSettings;
2420
import org.elasticsearch.common.settings.IndexScopedSettings;
2521
import org.elasticsearch.common.settings.Settings;
2622
import org.elasticsearch.common.settings.SettingsFilter;
27-
import org.elasticsearch.env.Environment;
28-
import org.elasticsearch.env.NodeEnvironment;
2923
import org.elasticsearch.index.analysis.AnalyzerProvider;
3024
import org.elasticsearch.index.analysis.TokenizerFactory;
31-
import org.elasticsearch.indices.IndicesService;
3225
import org.elasticsearch.indices.analysis.AnalysisModule;
3326
import org.elasticsearch.plugins.ActionPlugin;
3427
import org.elasticsearch.plugins.AnalysisPlugin;
3528
import org.elasticsearch.plugins.Plugin;
36-
import org.elasticsearch.repositories.RepositoriesService;
3729
import org.elasticsearch.rest.RestController;
3830
import org.elasticsearch.rest.RestHandler;
39-
import org.elasticsearch.script.ScriptService;
40-
import org.elasticsearch.telemetry.TelemetryProvider;
41-
import org.elasticsearch.threadpool.ThreadPool;
42-
import org.elasticsearch.watcher.ResourceWatcherService;
43-
import org.elasticsearch.xcontent.NamedXContentRegistry;
4431

4532
import java.util.Arrays;
4633
import java.util.Collection;
@@ -55,8 +42,8 @@ public class AnalysisAnsjPlugin extends Plugin implements AnalysisPlugin, Action
5542
private static final Logger LOG = LogManager.getLogger();
5643

5744
@Override
58-
public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool, ResourceWatcherService resourceWatcherService, ScriptService scriptService, NamedXContentRegistry xContentRegistry, Environment environment, NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<RepositoriesService> repositoriesServiceSupplier, TelemetryProvider telemetryProvider, AllocationService allocationService, IndicesService indicesService) {
59-
return Collections.singletonList(new AnsjElasticConfigurator(environment));
45+
public Collection<?> createComponents(PluginServices services) {
46+
return Collections.singletonList(new AnsjElasticConfigurator(services.environment()));
6047
}
6148

6249
@Override

0 commit comments

Comments
 (0)