diff --git a/README.md b/README.md index ac066ba8..1ca61995 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Reduce development, Release ideas (减少开发,释放思想) .... - 1.7.0 + 1.7.1 .... diff --git a/pom.xml b/pom.xml index 4a7fa75b..b8837e8e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.feilong.platform parent - 1.7.1-SNAPSHOT + 1.7.1 feilong-core diff --git a/src/main/java/com/feilong/core/bean/ConvertUtil.java b/src/main/java/com/feilong/core/bean/ConvertUtil.java index 695377b1..f4b2ef0c 100644 --- a/src/main/java/com/feilong/core/bean/ConvertUtil.java +++ b/src/main/java/com/feilong/core/bean/ConvertUtil.java @@ -512,7 +512,7 @@ public static Integer[] toIntegers(Object toBeConvertedValue){ * String[] orderIdArray = orderIds.split(","); * int orderLength = orderIdArray.length; * long[] ids = new long[orderLength]; - * for (int i = 0, j = orderLength; i < j; ++i){ + * for (int i = 0, j = orderLength; i {@code <} j; ++i){ * ids[i] = Long.parseLong(orderIdArray[i]); * } * return ids; @@ -774,12 +774,12 @@ public static Enumeration toEnumeration(final Collection collection){ * *
      * 
-     * Map map = ConvertUtil.toMap(
+     * Map{@code } map = ConvertUtil.toMap(
      *                 ConvertUtil.toList(
-     *                                 new SimpleEntry<>("张飞", "丈八蛇矛"),
-     *                                 new SimpleEntry<>("关羽", "青龙偃月刀"),
-     *                                 new SimpleEntry<>("赵云", "龙胆枪"),
-     *                                 new SimpleEntry<>("刘备", "双股剑")));
+     *                                 new SimpleEntry{@code <>}("张飞", "丈八蛇矛"),
+     *                                 new SimpleEntry{@code <>}("关羽", "青龙偃月刀"),
+     *                                 new SimpleEntry{@code <>}("赵云", "龙胆枪"),
+     *                                 new SimpleEntry{@code <>}("刘备", "双股剑")));
      * LOGGER.debug(JsonUtil.format(map));
      * 
      * 
@@ -843,7 +843,7 @@ public static > Map toMap(Collection ma * *
      * 
-     * Map map = ConvertUtil.toMap(
+     * Map{@code } map = ConvertUtil.toMap(
      * 
      *                 Pair.of("张飞", "丈八蛇矛"),
      *                 Pair.of("关羽", "青龙偃月刀"),
@@ -873,11 +873,11 @@ public static > Map toMap(Collection ma
      * 
      * 
      * 
-     * Map map = ConvertUtil.toMap(
-     *                 new SimpleEntry<>("张飞", "丈八蛇矛"),
-     *                 new SimpleEntry<>("关羽", "青龙偃月刀"),
-     *                 new SimpleEntry<>("赵云", "龙胆枪"),
-     *                 new SimpleEntry<>("刘备", "双股剑"));
+     * Map{@code } map = ConvertUtil.toMap(
+     *                 new SimpleEntry{@code <>}("张飞", "丈八蛇矛"),
+     *                 new SimpleEntry{@code <>}("关羽", "青龙偃月刀"),
+     *                 new SimpleEntry{@code <>}("赵云", "龙胆枪"),
+     *                 new SimpleEntry{@code <>}("刘备", "双股剑"));
      * LOGGER.debug(JsonUtil.format(map));
      * 
      * 
@@ -906,7 +906,7 @@ public static > Map toMap(Collection ma *
      * 
      * // 除数和单位的map,必须是有顺序的 从大到小.
-     * private static final Map DIVISOR_AND_UNIT_MAP = new LinkedHashMap<>();
+     * private static final Map{@code } DIVISOR_AND_UNIT_MAP = new LinkedHashMap{@code <>}();
      * 
      * static{
      *     DIVISOR_AND_UNIT_MAP.put(FileUtils.ONE_TB, "TB");//(Terabyte,太字节,或百万兆字节)=1024GB,其中1024=2^10 ( 2 的10次方)。 
@@ -922,7 +922,7 @@ public static > Map toMap(Collection ma
      * 
      * 
      * // 除数和单位的map,必须是有顺序的 从大到小.
-     * private static final Map DIVISOR_AND_UNIT_MAP = ConvertUtil.toMap(
+     * private static final Map{@code } DIVISOR_AND_UNIT_MAP = ConvertUtil.toMap(
      *                 Pair.of(FileUtils.ONE_TB, "TB"), //(Terabyte,太字节,或百万兆字节)=1024GB,其中1024=2^10 ( 2 的10次方)。 
      *                 Pair.of(FileUtils.ONE_GB, "GB"), //(Gigabyte,吉字节,又称“千兆”)=1024MB, 
      *                 Pair.of(FileUtils.ONE_MB, "MB"), //(Megabyte,兆字节,简称“兆”)=1024KB, 
@@ -1014,7 +1014,7 @@ public static  Map toMap(Map.Entry...mapEntrys){
      *            the key
      * @param value
      *            the value
-     * @return the map< k, v>
+     * @return 将 keyvalue 直接转成map
      * @see org.apache.commons.lang3.ArrayUtils#toMap(Object[])
      * @since 1.7.1
      */
diff --git a/src/main/java/com/feilong/core/net/ParamUtil.java b/src/main/java/com/feilong/core/net/ParamUtil.java
index 557e97b1..61b900af 100644
--- a/src/main/java/com/feilong/core/net/ParamUtil.java
+++ b/src/main/java/com/feilong/core/net/ParamUtil.java
@@ -66,7 +66,7 @@ private ParamUtil(){
      * 
* *
-     * String uri = "http://www.feilong.com:8888/esprit-frontend/search.htm?keyword=%E6%81%A4&page=";
+     * String uri = "http://www.feilong.com:8888/esprit-frontend/search.htm?{@code keyword=%E6%81%A4&page=}";
      * String pageParamName = "label";
      * String prePageNo = "2-5-8-12";
      * LOGGER.info(ParamUtil.addParameter(uri, pageParamName, prePageNo, CharsetType.UTF8));
@@ -279,7 +279,7 @@ public static String addParameterArrayValueMap(URI uri,Map arr
      * 
* *
-     * String uriString = "http://www.feilong.com:8888/search.htm?keyword=中国&page=&categoryCode=2-5-3-11&label=TopSeller";
+     * String uriString = "http://www.feilong.com:8888/search.htm?{@code keyword=中国&page=&categoryCode=2-5-3-11&label=TopSeller"};
      * String pageParamName = "label";
      * LOGGER.info(ParamUtil.removeParameter(uriString, pageParamName, CharsetType.UTF8));
      * 
@@ -287,7 +287,7 @@ public static String addParameterArrayValueMap(URI uri,Map arr * 返回: * *
-     * http://www.feilong.com:8888/search.htm?keyword=%E4%B8%AD%E5%9B%BD&page=&categoryCode=2-5-3-11
+     * http://www.feilong.com:8888/search.htm?keyword={@code %E4%B8%AD%E5%9B%BD&page=&categoryCode=2-5-3-11}
      * 
* *
@@ -336,7 +336,7 @@ public static String removeParameter(URI uri,String paramName,String charsetType * *
      * 
-     * String uriString = "http://www.feilong.com:8888/search.htm?keyword=中国&page=&categoryCode=2-5-3-11&label=TopSeller";
+     * String uriString = "http://www.feilong.com:8888/search.htm?{@code keyword=中国&page=&categoryCode=2-5-3-11&label=TopSeller"};
      * List{@code } paramNameList = new ArrayList{@code }();
      * paramNameList.add("label");
      * paramNameList.add("keyword");
@@ -347,7 +347,7 @@ public static String removeParameter(URI uri,String paramName,String charsetType
      * 返回:
      * 
      * 
-     * http://www.feilong.com:8888/search.htm?page=&categoryCode=2-5-3-11
+     * http://www.feilong.com:8888/search.htm?{@code page=&categoryCode=2-5-3-11}
      * 
* *
@@ -426,7 +426,7 @@ private static String removeParameterList(String uriString,String queryString,Li * *
      * 
-     * String uriString = "http://www.feilong.com:8888/search.htm?keyword=中国&page=&categoryCode=2-5-3-11&label=TopSeller";
+     * String uriString = "http://www.feilong.com:8888/search.htm?{@code keyword=中国&page=&categoryCode=2-5-3-11&label=TopSeller}";
      * List{@code } paramNameList = new ArrayList{@code }();
      * paramNameList.add("label");
      * paramNameList.add("keyword");
@@ -437,7 +437,7 @@ private static String removeParameterList(String uriString,String queryString,Li
      * 返回:
      * 
      * 
-     * {@code http://www.feilong.com:8888/search.htm?label=TopSeller&keyword=%E4%B8%AD%E5%9B%BD}
+     * http://www.feilong.com:8888/search.htm?{@code label=TopSeller&keyword=%E4%B8%AD%E5%9B%BD}
      * 
* * diff --git a/src/main/java/com/feilong/core/util/predicate/ArrayContainsPredicate.java b/src/main/java/com/feilong/core/util/predicate/ArrayContainsPredicate.java index a1cd2d7c..f5af8ed4 100644 --- a/src/main/java/com/feilong/core/util/predicate/ArrayContainsPredicate.java +++ b/src/main/java/com/feilong/core/util/predicate/ArrayContainsPredicate.java @@ -43,9 +43,9 @@ public class ArrayContainsPredicate implements Predicate{ /** * The Constructor. - * - * @param * + * @param + * the value type * @param propertyName * 泛型T对象指定的属性名称,Possibly indexed and/or nested name of the property to be modified,参见 * propertyName