update

Author: shi-yuan

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

@@ -1,5 +1,6 @@
 package org.ansj.elasticsearch.index.analysis;
 
+import org.ansj.elasticsearch.index.config.AnsjElasticConfigurator;
 import org.ansj.lucene6.AnsjAnalyzer;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.inject.Inject;
@@ -9,6 +10,8 @@
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
 
+import java.util.Map;
+
 public class AnsjAnalyzerProvider extends AbstractIndexAnalyzerProvider<AnsjAnalyzer> {
 
     private static final Logger LOG = Loggers.getLogger(AnsjAnalyzerProvider.class);
@@ -21,9 +24,15 @@ public AnsjAnalyzerProvider(IndexSettings indexSettings, @Assisted String name,
 
         Settings settings2 = indexSettings.getSettings().getAsSettings("index.analysis.tokenizer." + name());
 
-        LOG.debug("instance analyzer settings : {}", settings2.getAsMap());
+        Map<String, String> args = settings2.getAsMap();
+        if (args.isEmpty()) {
+            args = AnsjElasticConfigurator.getDefaults();
+            args.put("type", name());
+        }
+
+        LOG.debug("instance analyzer settings : {}", args);
 
-        analyzer = new AnsjAnalyzer(settings2.getAsMap());
+        analyzer = new AnsjAnalyzer(args);
     }
 
     @Override

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

@@ -19,6 +19,7 @@
 
 package org.ansj.elasticsearch.index.analysis;
 
+import org.ansj.elasticsearch.index.config.AnsjElasticConfigurator;
 import org.ansj.lucene6.AnsjAnalyzer;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.analysis.Tokenizer;
@@ -29,6 +30,8 @@
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.analysis.AbstractTokenizerFactory;
 
+import java.util.Map;
+
 public class AnsjTokenizerTokenizerFactory extends AbstractTokenizerFactory {
 
     private static final Logger LOG = Loggers.getLogger(AnsjTokenizerTokenizerFactory.class);
@@ -42,8 +45,14 @@ public AnsjTokenizerTokenizerFactory(IndexSettings indexSettings, @Assisted Stri
     public Tokenizer create() {
         Settings settings = indexSettings.getSettings().getAsSettings("index.analysis.tokenizer." + name());
 
-        LOG.debug("instance tokenizer settings : {}", settings.getAsMap());
+        Map<String, String> args = settings.getAsMap();
+        if (args.isEmpty()) {
+            args = AnsjElasticConfigurator.getDefaults();
+            args.put("type", name());
+        }
+
+        LOG.debug("instance tokenizer settings : {}", args);
 
-        return AnsjAnalyzer.getTokenizer(null, settings.getAsMap());
+        return AnsjAnalyzer.getTokenizer(null, args);
     }
 }

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

@@ -2,14 +2,12 @@
 
 import org.ansj.dic.PathToStream;
 import org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin;
-import org.ansj.library.AmbiguityLibrary;
-import org.ansj.library.DicLibrary;
-import org.ansj.library.StopLibrary;
-import org.ansj.library.SynonymsLibrary;
+import org.ansj.library.*;
 import org.ansj.splitWord.analysis.ToAnalysis;
 import org.ansj.util.MyStaticValue;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.SpecialPermission;
+import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
@@ -132,7 +130,7 @@ private void preheat() {
      *
      * @param map
      */
-    private static void setGlobalVar(Map<String, String> map) {
+    private void setGlobalVar(Map<String, String> map) {
         // 是否开启人名识别
         if (map.containsKey("isNameRecognition")) {
             MyStaticValue.isNameRecognition = Boolean.valueOf(map.get("isNameRecognition"));
@@ -174,4 +172,27 @@ public void reloadConfig() {
         LOG.info("to remove AmbiguityLibrary keys not in MyStaticValue.ENV");
         AmbiguityLibrary.keys().removeIf(key -> !MyStaticValue.ENV.containsKey(key));
     }
+
+    /**
+     * 默认配置
+     */
+    public static Map<String, String> getDefaults() {
+        return MapBuilder.<String, String>newMapBuilder()
+                // 是否开启人名识别
+                .put("isNameRecognition", MyStaticValue.isNameRecognition.toString())
+                // 是否开启数字识别
+                .put("isNumRecognition", MyStaticValue.isNumRecognition.toString())
+                // 是否数字和量词合并
+                .put("isQuantifierRecognition", MyStaticValue.isQuantifierRecognition.toString())
+                // 是否显示真实词语
+                .put("isRealName", MyStaticValue.isRealName.toString())
+                // 是否用户辞典不加载相同的词
+                .put("isSkipUserDefine", String.valueOf(MyStaticValue.isSkipUserDefine))
+                .put(CrfLibrary.DEFAULT, CrfLibrary.DEFAULT)
+                .put(DicLibrary.DEFAULT, DicLibrary.DEFAULT)
+                .put(StopLibrary.DEFAULT, StopLibrary.DEFAULT)
+                .put(SynonymsLibrary.DEFAULT, SynonymsLibrary.DEFAULT)
+                .put(AmbiguityLibrary.DEFAULT, AmbiguityLibrary.DEFAULT)
+                .map();
+    }
 }