es 6.1.0 support

Author: shi-yuan

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.ansj</groupId>
 	<artifactId>elasticsearch-analysis-ansj</artifactId>
-	<version>6.0.1.0</version>
+	<version>6.1.0.0</version>
 	<description>elasticsearch analysis by ansj</description>
 	<name>elasticsearch-analysis-ansj</name>
 	<url>http://maven.nlpcn.org</url>
@@ -23,7 +23,7 @@
 		<elasticsearch.plugin.site>true</elasticsearch.plugin.site>
 		<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
         <elasticsearch.plugin.java.version>1.8</elasticsearch.plugin.java.version>
-		<elasticsearch.version>6.0.1</elasticsearch.version>
+		<elasticsearch.version>6.1.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin</elasticsearch.plugin.classname>
 	</properties>
 

src/main/java/org/ansj/elasticsearch/index/analysis/AnsjAnalyzerProvider.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
 
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class AnsjAnalyzerProvider extends AbstractIndexAnalyzerProvider<AnsjAnalyzer> {
 
@@ -24,7 +25,7 @@ public AnsjAnalyzerProvider(IndexSettings indexSettings, @Assisted String name,
 
         Settings settings2 = indexSettings.getSettings().getAsSettings("index.analysis.tokenizer." + name());
 
-        Map<String, String> args = settings2.getAsMap();
+        Map<String, String> args = settings2.keySet().stream().collect(Collectors.toMap(k -> k, settings2::get));
         if (args.isEmpty()) {
             args = AnsjElasticConfigurator.getDefaults();
             args.put("type", name());

src/main/java/org/ansj/elasticsearch/index/analysis/AnsjTokenizerTokenizerFactory.java

@@ -31,6 +31,7 @@
 import org.elasticsearch.index.analysis.AbstractTokenizerFactory;
 
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class AnsjTokenizerTokenizerFactory extends AbstractTokenizerFactory {
 
@@ -48,7 +49,7 @@ public AnsjTokenizerTokenizerFactory(IndexSettings indexSettings, @Assisted Stri
     public Tokenizer create() {
         Settings settings = indexSettings.getSettings().getAsSettings("index.analysis.tokenizer." + this.name);
 
-        Map<String, String> args = settings.getAsMap();
+        Map<String, String> args = settings.keySet().stream().collect(Collectors.toMap(k -> k, settings::get));
         if (args.isEmpty()) {
             args = AnsjElasticConfigurator.getDefaults();
             args.put("type", this.name);

src/main/java/org/ansj/elasticsearch/index/config/AnsjElasticConfigurator.java

@@ -1,7 +1,6 @@
 package org.ansj.elasticsearch.index.config;
 
 import org.ansj.dic.PathToStream;
-import org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin;
 import org.ansj.library.*;
 import org.ansj.splitWord.analysis.ToAnalysis;
 import org.ansj.util.MyStaticValue;
@@ -24,6 +23,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class AnsjElasticConfigurator {
 
@@ -76,8 +76,8 @@ private void flushConfig() {
         MyStaticValue.ENV.clear();
 
         // 插入到变量中
-        if (ansjSettings != null) {
-            MyStaticValue.ENV.putAll(ansjSettings.getAsMap());
+        if (ansjSettings != null && !ansjSettings.isEmpty()) {
+            MyStaticValue.ENV.putAll(ansjSettings.keySet().stream().collect(Collectors.toMap(k -> k, ansjSettings::get)));
         }
 
         // 设置全局变量