From b6ec9c0a0080d6203dd9d4adf1d3685f002f0e7e Mon Sep 17 00:00:00 2001 From: medcl Date: Wed, 28 Sep 2016 12:13:42 +0200 Subject: [PATCH] update to support es5.0.0-beta1, Closes #282 --- README.md | 4 ++-- pom.xml | 10 +++++----- .../java/org/wltea/analyzer/cfg/Configuration.java | 9 +-------- src/main/java/org/wltea/analyzer/dic/Dictionary.java | 8 +++++--- src/main/java/org/wltea/analyzer/dic/Monitor.java | 12 ++++++------ src/main/java/org/wltea/analyzer/help/Sleep.java | 8 ++++---- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 49a2177..de8e7aa 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Versions IK version | ES version -----------|----------- master | 5.x -> master -5.0.0-alpha5 | 5.0.0-alpha5 +5.0.0-beta1 | 5.0.0-beta1 1.9.5 | 2.3.5 1.9.4 | 2.3.4 1.9.3 | 2.3.3 @@ -241,7 +241,7 @@ Changes *5.0.0* -- 移除名为 ik analyzer和tokenizer,请分别使用 ik_smart 和 ik_max_word +- 移除名为 `ik` 的analyzer和tokenizer,请分别使用 `ik_smart` 和 `ik_max_word` Thanks diff --git a/pom.xml b/pom.xml index 9aa9147..88c7b9c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 2011 - 5.0.0-alpha5 + 5.0.0-beta1 1.8 ${project.basedir}/src/main/assemblies/plugin.xml analysis-ik @@ -72,6 +72,7 @@ compile + org.apache.httpcomponents httpclient @@ -79,10 +80,9 @@ - log4j - log4j - 1.2.17 - runtime + org.apache.logging.log4j + log4j-api + 2.3 diff --git a/src/main/java/org/wltea/analyzer/cfg/Configuration.java b/src/main/java/org/wltea/analyzer/cfg/Configuration.java index a58f46a..dadd0f2 100644 --- a/src/main/java/org/wltea/analyzer/cfg/Configuration.java +++ b/src/main/java/org/wltea/analyzer/cfg/Configuration.java @@ -5,20 +5,13 @@ package org.wltea.analyzer.cfg; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin; import org.wltea.analyzer.dic.Dictionary; -import java.io.*; -import java.net.URL; +import java.io.File; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.InvalidPropertiesFormatException; -import java.util.List; -import java.util.Properties; public class Configuration { diff --git a/src/main/java/org/wltea/analyzer/dic/Dictionary.java b/src/main/java/org/wltea/analyzer/dic/Dictionary.java index d36c8d1..daa5b62 100644 --- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java +++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java @@ -45,10 +45,11 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.common.logging.Loggers; +import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin; import org.wltea.analyzer.cfg.Configuration; +import org.apache.logging.log4j.Logger; + /** * 词典管理类,单子模式 @@ -76,7 +77,8 @@ public class Dictionary { * 配置对象 */ private Configuration configuration; - public static ESLogger logger = Loggers.getLogger("ik-analyzer"); + + private static final Logger logger = ESLoggerFactory.getLogger(Monitor.class.getName()); private static ScheduledExecutorService pool = Executors.newScheduledThreadPool(1); diff --git a/src/main/java/org/wltea/analyzer/dic/Monitor.java b/src/main/java/org/wltea/analyzer/dic/Monitor.java index be18e06..fb5355c 100644 --- a/src/main/java/org/wltea/analyzer/dic/Monitor.java +++ b/src/main/java/org/wltea/analyzer/dic/Monitor.java @@ -7,12 +7,12 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpHead; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.common.logging.Loggers; +import org.apache.logging.log4j.Logger; +import org.elasticsearch.common.logging.ESLoggerFactory; public class Monitor implements Runnable { - public static ESLogger logger= Loggers.getLogger("ik-analyzer"); + private static final Logger logger = ESLoggerFactory.getLogger(Monitor.class.getName()); private static CloseableHttpClient httpclient = HttpClients.createDefault(); /* @@ -80,11 +80,11 @@ public class Monitor implements Runnable { //没有修改，不做操作 //noop }else{ - Dictionary.logger.info("remote_ext_dict {} return bad code {}" , location , response.getStatusLine().getStatusCode() ); + logger.info("remote_ext_dict {} return bad code {}" , location , response.getStatusLine().getStatusCode() ); } } catch (Exception e) { - Dictionary.logger.error("remote_ext_dict {} error!",e , location); + logger.error("remote_ext_dict {} error!",e , location); }finally{ try { if (response != null) { @@ -96,4 +96,4 @@ public class Monitor implements Runnable { } } -} \ No newline at end of file +} diff --git a/src/main/java/org/wltea/analyzer/help/Sleep.java b/src/main/java/org/wltea/analyzer/help/Sleep.java index 0954c15..94a2278 100644 --- a/src/main/java/org/wltea/analyzer/help/Sleep.java +++ b/src/main/java/org/wltea/analyzer/help/Sleep.java @@ -1,11 +1,11 @@ package org.wltea.analyzer.help; -import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.common.logging.Loggers; +import org.apache.logging.log4j.Logger; +import org.elasticsearch.common.logging.ESLoggerFactory; public class Sleep { - public static ESLogger logger= Loggers.getLogger("ik-analyzer"); + private static final Logger logger = ESLoggerFactory.getLogger(Sleep.class.getName()); public enum Type{MSEC,SEC,MIN,HOUR}; public static void sleep(Type type,int num){ @@ -33,4 +33,4 @@ public class Sleep { } -} \ No newline at end of file +}