update to 8.4.1

Update log4j

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: medcl
+custom: ["https://www.buymeacoffee.com/medcl"]

pom.xml

@@ -12,7 +12,7 @@
     <inceptionYear>2011</inceptionYear>
 
     <properties>
-        <elasticsearch.version>7.4.0</elasticsearch.version>
+        <elasticsearch.version>8.4.1</elasticsearch.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
         <elasticsearch.plugin.name>analysis-ik</elasticsearch.plugin.name>
@@ -34,10 +34,10 @@
 
     <developers>
         <developer>
-            <name>Medcl</name>
-            <email>medcl@elastic.co</email>
-            <organization>elastic</organization>
-            <organizationUrl>http://www.elastic.co</organizationUrl>
+            <name>INFINI Labs</name>
+            <email>hello@infini.ltd</email>
+            <organization>INFINI Labs</organization>
+            <organizationUrl>https://infinilabs.com</organizationUrl>
         </developer>
     </developers>
 
@@ -71,7 +71,7 @@
             <name>OSS Sonatype</name>
             <releases><enabled>true</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://oss.sonatype.org/content/repositories/releases/</url>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
         </repository>
     </repositories>
 
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.3</version>
+            <version>2.18.0</version>
         </dependency>
 
         <dependency>

src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java

@@ -10,7 +10,7 @@ public class IkAnalyzerProvider extends AbstractIndexAnalyzerProvider<IKAnalyzer
     private final IKAnalyzer analyzer;
 
     public IkAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings,boolean useSmart) {
-        super(indexSettings, name, settings);
+        super(name, settings);
 
         Configuration configuration=new Configuration(env,settings).setUseSmart(useSmart);
 

src/main/java/org/wltea/analyzer/cfg/Configuration.java

@@ -4,7 +4,7 @@
 package org.wltea.analyzer.cfg;
 
 import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.io.PathUtils;
+import org.elasticsearch.core.PathUtils;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin;

src/main/java/org/wltea/analyzer/dic/DictSegment.java

@@ -57,7 +57,7 @@ class DictSegment implements Comparable<DictSegment>{
 	
 	DictSegment(Character nodeChar){
 		if(nodeChar == null){
-			throw new IllegalArgumentException("参数为空异常，字符不能为空");
+			throw new IllegalArgumentException("node char cannot be empty");
 		}
 		this.nodeChar = nodeChar;
 	}

src/main/java/org/wltea/analyzer/dic/Dictionary.java

@@ -52,7 +52,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.elasticsearch.SpecialPermission;
-import org.elasticsearch.common.io.PathUtils;
+import org.elasticsearch.core.PathUtils;
 import org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin;
 import org.wltea.analyzer.cfg.Configuration;
 import org.apache.logging.log4j.Logger;
@@ -80,7 +80,7 @@ public class Dictionary {
 	 */
 	private Configuration configuration;
 
-	private static final Logger logger = ESPluginLoggerFactory.getLogger(Monitor.class.getName());
+	private static final Logger logger = ESPluginLoggerFactory.getLogger(Dictionary.class.getName());
 
 	private static ScheduledExecutorService pool = Executors.newScheduledThreadPool(1);
 
@@ -294,7 +294,7 @@ public class Dictionary {
 	 */
 	public static Dictionary getSingleton() {
 		if (singleton == null) {
-			throw new IllegalStateException("词典尚未初始化，请先调用initial方法");
+			throw new IllegalStateException("ik dict has not been initialized yet, please call initial method first.");
 		}
 		return singleton;
 	}
@@ -419,7 +419,7 @@ public class Dictionary {
 			List<String> lists = getRemoteWords(location);
 			// 如果找不到扩展的字典，则忽略
 			if (lists == null) {
-				logger.error("[Dict Loading] " + location + "加载失败");
+				logger.error("[Dict Loading] " + location + " load failed");
 				continue;
 			}
 			for (String theWord : lists) {
@@ -469,7 +469,7 @@ public class Dictionary {
 						}
 					}
 
-					if (entity.getContentLength() > 0) {
+					if (entity.getContentLength() > 0 || entity.isChunked()) {
 						in = new BufferedReader(new InputStreamReader(entity.getContent(), charset));
 						String line;
 						while ((line = in.readLine()) != null) {
@@ -518,7 +518,7 @@ public class Dictionary {
 			List<String> lists = getRemoteWords(location);
 			// 如果找不到扩展的字典，则忽略
 			if (lists == null) {
-				logger.error("[Dict Loading] " + location + "加载失败");
+				logger.error("[Dict Loading] " + location + " load failed");
 				continue;
 			}
 			for (String theWord : lists) {
@@ -562,7 +562,7 @@ public class Dictionary {
 	}
 
 	void reLoadMainDict() {
-		logger.info("重新加载词典...");
+		logger.info("start to reload ik dict.");
 		// 新开一个实例加载词典，减少加载过程对当前词典使用的影响
 		Dictionary tmpDict = new Dictionary(configuration);
 		tmpDict.configuration = getSingleton().configuration;
@@ -570,7 +570,7 @@ public class Dictionary {
 		tmpDict.loadStopWordDict();
 		_MainDict = tmpDict._MainDict;
 		_StopWords = tmpDict._StopWords;
-		logger.info("重新加载词典完毕...");
+		logger.info("reload ik dict finished.");
 	}
 
 }