common-lang -> common-lang3

reflection:0.9.9.RC1 -> reflection:0.9.10
upgrade according to
https://github.com/knightliao/disconf/issues/81

disconf-client/pom.xml

@@ -70,14 +70,14 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.9-RC1</version>
+            <version>0.9.10</version>
         </dependency>
 
         <dependency>

disconf-client/src/main/java/com/baidu/disconf/client/common/constants/SupportFileTypeEnum.java

@@ -1,7 +1,7 @@
 package com.baidu.disconf.client.common.constants;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 支持的文件后缀类型

disconf-client/src/main/java/com/baidu/disconf/client/config/inner/DisInnerConfigHelper.java

@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

disconf-client/src/main/java/com/baidu/disconf/client/scan/inner/statically/strategy/impl/ReflectionScanStatic.java

@@ -81,7 +81,7 @@ public class ReflectionScanStatic implements ScanStaticStrategy {
         //
         Collection<URL> urlTotals = new ArrayList<URL>();
         for (String packName : packNameList) {
-            Set<URL> urls = ClasspathHelper.forPackage(packName);
+            Collection<URL> urls = ClasspathHelper.forPackage(packName, ClasspathHelper.classLoaders());
             urlTotals.addAll(urls);
         }
 
@@ -138,10 +138,9 @@ public class ReflectionScanStatic implements ScanStaticStrategy {
 
             } else {
 
-                LOGGER
-                        .error("cannot find CLASS ANNOTATION " + DisconfFile.class.getName()
-                                + " for disconf file item: " +
-                                method.toString());
+                LOGGER.error("cannot find CLASS ANNOTATION " + DisconfFile.class.getName()
+                        + " for disconf file item: " +
+                        method.toString());
             }
         }
 
@@ -155,7 +154,7 @@ public class ReflectionScanStatic implements ScanStaticStrategy {
 
             // 校验是否所有配置文件都含有配置
             if (disconfFileItemMap.get(classFile).isEmpty()) {
-                LOGGER.warn("disconf file hasn't any items: " + classFile.getName());
+                LOGGER.info("disconf file hasn't any items: " + classFile.getName());
                 continue;
             }
 

disconf-client/src/main/java/com/baidu/disconf/client/store/inner/DisconfCenterStore.java

@@ -70,8 +70,8 @@ public class DisconfCenterStore {
 
         if (confFileMap.containsKey(fileName)) {
 
-            LOGGER.error("There are two same fileName!!!! " + "first: " + confFileMap.get(fileName).toString() +
-                    ", Second: " + disconfCenterFile.toString());
+            LOGGER.error("There are two same fileName key!!!! " + "first: " + confFileMap.get(fileName).toString() +
+                    "\n, Second: " + disconfCenterFile.toString());
         } else {
             confFileMap.put(fileName, disconfCenterFile);
         }
@@ -88,7 +88,7 @@ public class DisconfCenterStore {
 
         if (confItemMap.containsKey(key)) {
 
-            LOGGER.error("There are two same fileName!!!! " + "first: " + confItemMap.get(key).getClass().toString() +
+            LOGGER.error("There are two same item key!!!! " + "first: " + confItemMap.get(key).getClass().toString() +
                     ", Second: " + disconfCenterItem.getClass().toString());
         } else {
             confItemMap.put(key, disconfCenterItem);

disconf-client/src/main/java/com/baidu/disconf/client/support/utils/MethodUtils.java

@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

disconf-client/src/main/java/com/baidu/disconf/client/support/utils/ScanPrinterUtils.java

@@ -33,13 +33,15 @@ public class ScanPrinterUtils {
         LOGGER.info("Now we will print store map......");
 
         Store store = reflections.getStore();
-        Map<String/* indexName */, Multimap<String, String>> storeMap = store.getStoreMap();
-        for (String indexName : storeMap.keySet()) {
+
+        Set<String> keys = store.keySet();
+
+        for (String indexName : keys) {
 
             LOGGER.info("====================================");
             LOGGER.info("indexName:" + indexName);
 
-            Multimap<String, String> multimap = storeMap.get(indexName);
+            Multimap<String, String> multimap = store.get(indexName);
 
             for (String firstName : multimap.keySet()) {
                 Collection<String> lastNames = multimap.get(firstName);

disconf-client/src/main/java/com/baidu/disconf/client/support/utils/StringUtil.java

@@ -3,8 +3,8 @@ package com.baidu.disconf.client.support.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 有关字符串处理的工具类。
@@ -25,6 +25,7 @@ public abstract class StringUtil {
     /**
      * @param source
      * @param token
+     *
      * @return
      */
     public static List<Integer> parseStringToIntegerList(String source,
@@ -53,6 +54,7 @@ public abstract class StringUtil {
     /**
      * @param source
      * @param token
+     *
      * @return
      */
     public static List<Long> parseStringToLongList(String source, String token) {
@@ -73,6 +75,7 @@ public abstract class StringUtil {
     /**
      * @param source
      * @param token
+     *
      * @return
      */
     public static List<String> parseStringToStringList(String source,
@@ -110,6 +113,7 @@ public abstract class StringUtil {
      *
      * @param str        要转换的字符串
      * @param defaultStr 默认字符串
+     *
      * @return 字符串本身或指定的默认字符串
      */
     public static String defaultIfEmpty(String str, String defaultStr) {
@@ -129,6 +133,7 @@ public abstract class StringUtil {
      *
      * @param str        要转换的字符串
      * @param defaultStr 默认字符串
+     *
      * @return 字符串本身或指定的默认字符串
      */
     public static String defaultIfBlank(String str, String defaultStr) {
@@ -156,6 +161,7 @@ public abstract class StringUtil {
      * </p>
      *
      * @param str 要转换的字符串
+     *
      * @return camel case字符串，如果原字符串为<code>null</code>，则返回<code>null</code>
      */
     public static String toCamelCase(String str) {
@@ -224,6 +230,7 @@ public abstract class StringUtil {
      * </p>
      *
      * @param str 要转换的字符串
+     *
      * @return pascal case字符串，如果原字符串为<code>null</code>，则返回<code>null</code>
      */
     public static String toPascalCase(String str) {
@@ -289,6 +296,7 @@ public abstract class StringUtil {
      * </p>
      *
      * @param str 要转换的字符串
+     *
      * @return 下划线分隔的大写字符串，如果原字符串为<code>null</code>，则返回<code>null</code>
      */
     public static String toUpperCaseWithUnderscores(String str) {
@@ -364,6 +372,7 @@ public abstract class StringUtil {
      * </p>
      *
      * @param str 要转换的字符串
+     *
      * @return 下划线分隔的小写字符串，如果原字符串为<code>null</code>，则返回<code>null</code>
      */
     public static String toLowerCaseWithUnderscores(String str) {
@@ -417,6 +426,7 @@ public abstract class StringUtil {
      * 将一个长整形转换成62进制的字符串。
      *
      * @param longValue 64位数字
+     *
      * @return 62进制的字符串
      */
     public static String longToString(long longValue) {
@@ -428,6 +438,7 @@ public abstract class StringUtil {
      *
      * @param longValue 64位数字
      * @param noCase    区分大小写
+     *
      * @return 62进制的字符串
      */
     public static String longToString(long longValue, boolean noCase) {
@@ -458,6 +469,7 @@ public abstract class StringUtil {
      * 将一个byte数组转换成62进制的字符串。
      *
      * @param bytes 二进制数组
+     *
      * @return 62进制的字符串
      */
     public static String bytesToString(byte[] bytes) {
@@ -469,6 +481,7 @@ public abstract class StringUtil {
      *
      * @param bytes  二进制数组
      * @param noCase 区分大小写
+     *
      * @return 62进制的字符串
      */
     public static String bytesToString(byte[] bytes, boolean noCase) {
@@ -507,6 +520,7 @@ public abstract class StringUtil {
      *
      * @param str 要比较的字符串
      * @param ch  结尾字符
+     *
      * @return 如果字符串<code>str</code>是否以字符<code>ch</code>结尾，则返回<code>true</code>
      */
     public static boolean endsWithChar(String str, char ch) {
@@ -546,6 +560,7 @@ public abstract class StringUtil {
      *
      * @param str 要比较的字符串
      * @param ch  开头字符
+     *
      * @return 如果字符串<code>str</code>是否以字符<code>ch</code> 开头，则返回<code>true</code>
      */
     public static boolean startsWithChar(String str, char ch) {

disconf-core/pom.xml

@@ -52,8 +52,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
 
         <dependency>

disconf-core/src/main/java/com/baidu/disconf/core/common/zookeeper/inner/PrintZookeeperTree.java

@@ -3,7 +3,7 @@ package com.baidu.disconf.core.common.zookeeper.inner;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;

disconf-web/pom.xml

@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.github.knightliao.apollo</groupId>
             <artifactId>apollo</artifactId>
-            <version>1.0.12</version>
+            <version>1.0.13</version>
         </dependency>
 
         <!-- common dependencies -->
@@ -242,19 +242,14 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
 
         <dependency>
@@ -268,8 +263,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
 
         <dependency>

disconf-web/src/main/java/com/baidu/disconf/web/common/comparator/StringComparator.java

@@ -40,8 +40,10 @@ public class StringComparator extends CommonComparator {
             return new ArrayList<String>();
         }
 
-        List<String> lines = new ArrayList<String>();
-        lines = StringUtil.parseStringToStringList(data, "\\r?\\n");
+        List<String> lines = StringUtil.parseStringToStringList(data, "\\r?\\n");
+        if (lines == null) {
+            lines = new ArrayList<String>();
+        }
 
         return lines;
     }

disconf-web/src/main/java/com/baidu/disconf/web/innerapi/zookeeper/impl/ZookeeperDriverImpl.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;

disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java

@@ -11,7 +11,7 @@ import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -461,10 +461,10 @@ public class ConfigMgrImpl implements ConfigMgr {
      */
     private String getNewValue(String newValue, String identify, String htmlClick) {
 
-        String contentString = StringEscapeUtils.escapeHtml(identify) + "<br/>" + htmlClick + "<br/><br/> ";
+        String contentString = StringEscapeUtils.escapeHtml4(identify) + "<br/>" + htmlClick + "<br/><br/> ";
 
         String data = "<br/><br/><br/><span style='color:#FF0000'>New value:</span><br/>";
-        contentString = contentString + data + StringEscapeUtils.escapeHtml(newValue);
+        contentString = contentString + data + StringEscapeUtils.escapeHtml4(newValue);
 
         return contentString;
     }

disconf-web/src/main/java/com/baidu/disconf/web/service/zookeeper/service/impl/ZkDeployMgrImpl.java

@@ -3,7 +3,7 @@ package com.baidu.disconf.web.service.zookeeper.service.impl;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

disconf-web/src/main/java/com/baidu/disconf/web/utils/DiffUtils.java

@@ -2,7 +2,7 @@ package com.baidu.disconf.web.utils;
 
 import java.io.IOException;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +48,7 @@ public class DiffUtils {
     public static String getDiff(String old, String newData, String identify, String htmlClick) {
 
         StringComparator stringComparator = new StringComparator(old, newData);
-        String contentString = StringEscapeUtils.escapeHtml(identify) + "<br/><br/>" + htmlClick + "<br/> ";
+        String contentString = StringEscapeUtils.escapeHtml4(identify) + "<br/><br/>" + htmlClick + "<br/> ";
 
         try {
 
@@ -61,30 +61,30 @@ public class DiffUtils {
             } else {
 
                 String oldValue = "<br/><br/><br/><span style='color:#FF0000'>Old value:</span><br/>" +
-                                      StringEscapeUtils.escapeHtml(old).replaceAll("\n", "<br/>");
+                        StringEscapeUtils.escapeHtml4(old).replaceAll("\n", "<br/>");
 
                 String newValue = "<br/><br/><br/><span style='color:#FF0000'>New value:</span><br/>" +
-                                      StringEscapeUtils.escapeHtml(newData).replaceAll("\n", "<br/>");
+                        StringEscapeUtils.escapeHtml4(newData).replaceAll("\n", "<br/>");
 
                 String diff = "";
                 if (stringComparator.getChangesFromOriginal().size() != 0) {
                     diff = "<span style='color:#FF0000'>Change info: </span><br/>";
                     for (Chunk chunk : stringComparator.getChangesFromOriginal()) {
-                        diff += StringEscapeUtils.escapeHtml(chunk.toString()) + "<br/>";
+                        diff += StringEscapeUtils.escapeHtml4(chunk.toString()) + "<br/>";
                     }
                 }
 
                 if (stringComparator.getInsertsFromOriginal().size() != 0) {
                     diff += "<br/><span style='color:#FF0000'>Insert info: </span><br/>";
                     for (Chunk chunk : stringComparator.getInsertsFromOriginal()) {
-                        diff += StringEscapeUtils.escapeHtml(chunk.toString()) + "<br/>";
+                        diff += StringEscapeUtils.escapeHtml4(chunk.toString()) + "<br/>";
                     }
                 }
 
                 if (stringComparator.getDeletesFromOriginal().size() != 0) {
                     diff += "<br/><span style='color:#FF0000'>Delete info: </span><br/>";
                     for (Chunk chunk : stringComparator.getDeletesFromOriginal()) {
-                        diff += StringEscapeUtils.escapeHtml(chunk.toString()) + "<br/>";
+                        diff += StringEscapeUtils.escapeHtml4(chunk.toString()) + "<br/>";
                     }
                 }
 

disconf-web/src/main/java/com/baidu/disconf/web/web/config/validator/ConfigValidator.java

@@ -1,6 +1,6 @@
 package com.baidu.disconf.web.web.config.validator;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -183,7 +183,7 @@ public class ConfigValidator {
         // key
         //
         Config config = configFetchMgr.getConfByParameter(app.getId(), env.getId(), confNewForm.getVersion(),
-                                                             confNewForm.getKey(), disConfigTypeEnum);
+                confNewForm.getKey(), disConfigTypeEnum);
         if (config != null) {
             throw new FieldException(ConfNewItemForm.KEY, "key.exist", null);
         }

disconf-web/src/main/java/com/baidu/disconf/web/web/config/validator/ConfigValidator4Fetch.java

@@ -1,8 +1,8 @@
 package com.baidu.disconf.web.web.config.validator;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import com.baidu.disconf.web.service.app.bo.App;
 import com.baidu.disconf.web.service.app.service.AppMgr;

disconf-web/src/main/java/com/baidu/disconf/web/web/zookeeper/validator/ZkDeployValidator.java

@@ -1,6 +1,6 @@
 package com.baidu.disconf.web.web.zookeeper.validator;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

disconf-web/src/main/java/com/baidu/dsp/common/utils/DaoUtils.java

@@ -3,7 +3,7 @@ package com.baidu.dsp.common.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.baidu.dsp.common.form.RequestListBase.Page;
 import com.baidu.ub.common.db.DaoPage;

disconf-web/src/main/java/com/baidu/dsp/common/utils/ListUtil.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import com.baidu.dsp.common.form.RequestListBase.Page;
 

disconf-web/src/main/java/com/baidu/dsp/common/utils/email/LogMailBean.java

@@ -5,7 +5,7 @@ import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

disconf-web/src/main/java/com/baidu/dsp/common/utils/email/MailBean.java

@@ -5,7 +5,7 @@ import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;

disconf-web/src/main/java/com/baidu/unbiz/common/genericdao/mapper/ORMapping.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.baidu.unbiz.common.genericdao.annotation.Table;
 import com.github.knightliao.apollo.db.bo.BaseObject;

pom.xml

@@ -129,9 +129,9 @@
             </dependency>
 
             <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.4</version>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.4</version>
             </dependency>
 
             <dependency>
@@ -216,12 +216,6 @@
                 <version>2.6.0</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.9.13</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.freemarker</groupId>
                 <artifactId>freemarker</artifactId>