From 33fb6ad67ee52a3d58b749de27bee06cf219daef Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Tue, 1 Dec 2015 21:56:18 +0800
Subject: [PATCH] fix null exception and update to support es2.1

---
 README.md                                                 | 5 +++--
 pom.xml                                                   | 4 ++--
 .../index/analysis/IkAnalysisBinderProcessor.java         | 2 +-
 .../elasticsearch/index/analysis/IkAnalyzerProvider.java  | 8 +++++---
 .../elasticsearch/index/analysis/IkTokenizerFactory.java  | 7 ++++---
 .../elasticsearch/indices/analysis/IKIndicesAnalysis.java | 8 +++++++-
 .../plugin/analysis/ik/AnalysisIkPlugin.java              | 7 ++++++-
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index c11df79..22ac6c3 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Versions
 IK version | ES version
 -----------|-----------
 master | 2.1.0 -> master
-1.5.1 | 2.1.0
+1.6.0 | 2.1.0
 1.5.0 | 2.0.0
 1.4.1 | 1.7.2
 1.4.0 | 1.6.0
@@ -231,9 +231,10 @@ have fun.
 ```bash
 git clone https://github.com/medcl/elasticsearch-analysis-ik
 cd elasticsearch-analysis-ik
+mvn clean
 mvn compile
 mvn package
-copy file  #{project_path}/elasticsearch-analysis-ik/target/releases/elasticsearch-analysis-ik-xxx-jar-with-dependencies.jar to your elasticsearch's folder: plugins/ik
+copy & unzip file  #{project_path}/elasticsearch-analysis-ik/target/releases/elasticsearch-analysis-ik-xxx.zip to your elasticsearch's folder: plugins/ik
 ```
 
 Thanks
diff --git a/pom.xml b/pom.xml
index 844128c..8ee199f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-ik</artifactId>
-    <version>1.5.1</version>
+    <version>1.6.0</version>
     <packaging>jar</packaging>
     <description>IK Analyzer for ElasticSearch</description>
     <inceptionYear>2009</inceptionYear>
 
     <properties>
         <elasticsearch.version>2.1.0</elasticsearch.version>
-
+        <maven.compiler.target>1.7</maven.compiler.target>
         <elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
         <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin</elasticsearch.plugin.classname>
         <elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
diff --git a/src/main/java/org/elasticsearch/index/analysis/IkAnalysisBinderProcessor.java b/src/main/java/org/elasticsearch/index/analysis/IkAnalysisBinderProcessor.java
index f9f2814..ae60ce3 100644
--- a/src/main/java/org/elasticsearch/index/analysis/IkAnalysisBinderProcessor.java
+++ b/src/main/java/org/elasticsearch/index/analysis/IkAnalysisBinderProcessor.java
@@ -18,6 +18,6 @@ public class IkAnalysisBinderProcessor extends AnalysisModule.AnalysisBinderProc
 
     @Override
     public void processTokenizers(TokenizersBindings tokenizersBindings) {
-        tokenizersBindings.processTokenizer("ik_tokenizer", IkTokenizerFactory.class);
+        tokenizersBindings.processTokenizer("ik", IkTokenizerFactory.class);
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java
index 365871f..32ad78c 100644
--- a/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java
+++ b/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java
@@ -1,9 +1,11 @@
 package org.elasticsearch.index.analysis;
 
 import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.inject.assistedinject.Assisted;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.settings.IndexSettingsService;
 import org.wltea.analyzer.cfg.Configuration;
 import org.wltea.analyzer.dic.Dictionary;
 import org.wltea.analyzer.lucene.IKAnalyzer;
@@ -13,10 +15,10 @@ public class IkAnalyzerProvider extends AbstractIndexAnalyzerProvider<IKAnalyzer
     private boolean useSmart=false;
 
     @Inject
-    public IkAnalyzerProvider(Index index, Settings indexSettings,Environment env, String name, Settings settings) {
-        super(index, indexSettings, name, settings);
+    public IkAnalyzerProvider(Index index, IndexSettingsService indexSettingsService, Environment env, @Assisted String name, @Assisted Settings settings) {
+        super(index, indexSettingsService.getSettings(), name, settings);
         Dictionary.initial(new Configuration(env));
-        useSmart = settings.get("use_smart", "false").equals("true");
+        useSmart = indexSettingsService.getSettings().get("use_smart", "false").equals("true");
         analyzer=new IKAnalyzer(useSmart);
     }
 
diff --git a/src/main/java/org/elasticsearch/index/analysis/IkTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/IkTokenizerFactory.java
index 62b4ddf..7b8d48c 100644
--- a/src/main/java/org/elasticsearch/index/analysis/IkTokenizerFactory.java
+++ b/src/main/java/org/elasticsearch/index/analysis/IkTokenizerFactory.java
@@ -6,6 +6,7 @@ import org.elasticsearch.common.inject.assistedinject.Assisted;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.settings.IndexSettingsService;
 import org.wltea.analyzer.cfg.Configuration;
 import org.wltea.analyzer.dic.Dictionary;
 import org.wltea.analyzer.lucene.IKTokenizer;
@@ -15,9 +16,9 @@ public class IkTokenizerFactory extends AbstractTokenizerFactory {
   private boolean useSmart=false;
 
   @Inject
-  public IkTokenizerFactory(Index index, Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) {
-	  super(index, indexSettings, name, settings);
-      this.settings=settings;
+  public IkTokenizerFactory(Index index, IndexSettingsService indexSettingsService,Environment env, @Assisted String name, @Assisted Settings settings) {
+	  super(index, indexSettingsService.getSettings(), name, settings);
+      this.settings=indexSettingsService.getSettings();
 	  Dictionary.initial(new Configuration(env));
   }
 
diff --git a/src/main/java/org/elasticsearch/indices/analysis/IKIndicesAnalysis.java b/src/main/java/org/elasticsearch/indices/analysis/IKIndicesAnalysis.java
index ee089a4..231cbbe 100644
--- a/src/main/java/org/elasticsearch/indices/analysis/IKIndicesAnalysis.java
+++ b/src/main/java/org/elasticsearch/indices/analysis/IKIndicesAnalysis.java
@@ -4,10 +4,13 @@ import org.apache.lucene.analysis.Tokenizer;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.analysis.AnalyzerScope;
 import org.elasticsearch.index.analysis.PreBuiltAnalyzerProviderFactory;
 import org.elasticsearch.index.analysis.PreBuiltTokenizerFactoryFactory;
 import org.elasticsearch.index.analysis.TokenizerFactory;
+import org.wltea.analyzer.cfg.Configuration;
+import org.wltea.analyzer.dic.Dictionary;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 import org.wltea.analyzer.lucene.IKTokenizer;
 
@@ -21,9 +24,12 @@ public class IKIndicesAnalysis extends AbstractComponent {
 
     @Inject
     public IKIndicesAnalysis(final Settings settings,
-                                   IndicesAnalysisService indicesAnalysisService) {
+                                   IndicesAnalysisService indicesAnalysisService,Environment env) {
         super(settings);
+        Dictionary.initial(new Configuration(env));
+
         this.useSmart = settings.get("use_smart", "false").equals("true");
+
         indicesAnalysisService.analyzerProviderFactories().put("ik",
                 new PreBuiltAnalyzerProviderFactory("ik", AnalyzerScope.GLOBAL,
                         new IKAnalyzer(useSmart)));
diff --git a/src/main/java/org/elasticsearch/plugin/analysis/ik/AnalysisIkPlugin.java b/src/main/java/org/elasticsearch/plugin/analysis/ik/AnalysisIkPlugin.java
index 1529c4b..671c836 100644
--- a/src/main/java/org/elasticsearch/plugin/analysis/ik/AnalysisIkPlugin.java
+++ b/src/main/java/org/elasticsearch/plugin/analysis/ik/AnalysisIkPlugin.java
@@ -1,15 +1,20 @@
 package org.elasticsearch.plugin.analysis.ik;
 
 import org.elasticsearch.common.inject.AbstractModule;
+import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.analysis.AnalysisModule;
 import org.elasticsearch.index.analysis.IkAnalysisBinderProcessor;
 import org.elasticsearch.indices.analysis.IKIndicesAnalysisModule;
 import org.elasticsearch.plugins.Plugin;
+import org.wltea.analyzer.cfg.Configuration;
+import org.wltea.analyzer.dic.Dictionary;
 
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.logging.Logger;
@@ -19,7 +24,7 @@ import static java.rmi.Naming.bind;
 
 public class AnalysisIkPlugin extends Plugin {
     private final Settings settings;
-
+    @Inject
     public AnalysisIkPlugin(Settings settings){
         this.settings = settings;
     }
-- 
GitLab