Skip to content
This repository has been archived by the owner on Aug 20, 2021. It is now read-only.

Commit

Permalink
upgrade to version>1.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@venusdrogon
venusdrogon committed Jun 18, 2016
1 parent 334289d commit 421dd33
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Reduce development, Release ideas (减少开发,释放思想)

....
<properties>
<version.feilong-platform>1.7.0</version.feilong-platform>
<version.feilong-platform>1.7.1</version.feilong-platform>
....
</properties>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.feilong.platform</groupId>
<artifactId>parent</artifactId>
<version>1.7.1-SNAPSHOT</version>
<version>1.7.1</version>
</parent>

<artifactId>feilong-core</artifactId>
Expand Down
30 changes: 15 additions & 15 deletions src/main/java/com/feilong/core/bean/ConvertUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -774,12 +774,12 @@ public static <T> Enumeration<T> toEnumeration(final Collection<T> collection){
*
* <pre class="code">
*
* Map<String, String> map = ConvertUtil.toMap(
* Map{@code <String, String>} 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));
*
* </pre>
Expand Down Expand Up @@ -843,7 +843,7 @@ public static <V, K, E extends Map.Entry<K, V>> Map<K, V> toMap(Collection<E> ma
*
* <pre class="code">
*
* Map<String, String> map = ConvertUtil.toMap(
* Map{@code <String, String>} map = ConvertUtil.toMap(
*
* Pair.of("张飞", "丈八蛇矛"),
* Pair.of("关羽", "青龙偃月刀"),
Expand Down Expand Up @@ -873,11 +873,11 @@ public static <V, K, E extends Map.Entry<K, V>> Map<K, V> toMap(Collection<E> ma
*
* <pre class="code">
*
* Map<String, String> map = ConvertUtil.toMap(
* new SimpleEntry<>("张飞", "丈八蛇矛"),
* new SimpleEntry<>("关羽", "青龙偃月刀"),
* new SimpleEntry<>("赵云", "龙胆枪"),
* new SimpleEntry<>("刘备", "双股剑"));
* Map{@code <String, String>} map = ConvertUtil.toMap(
* new SimpleEntry{@code <>}("张飞", "丈八蛇矛"),
* new SimpleEntry{@code <>}("关羽", "青龙偃月刀"),
* new SimpleEntry{@code <>}("赵云", "龙胆枪"),
* new SimpleEntry{@code <>}("刘备", "双股剑"));
* LOGGER.debug(JsonUtil.format(map));
*
* </pre>
Expand Down Expand Up @@ -906,7 +906,7 @@ public static <V, K, E extends Map.Entry<K, V>> Map<K, V> toMap(Collection<E> ma
* <pre class="code">
*
* // 除数和单位的map,必须是有顺序的 从大到小.
* private static final Map<Long, String> DIVISOR_AND_UNIT_MAP = new LinkedHashMap<>();
* private static final Map{@code <Long, String>} DIVISOR_AND_UNIT_MAP = new LinkedHashMap{@code <>}();
*
* static{
* DIVISOR_AND_UNIT_MAP.put(FileUtils.ONE_TB, "TB");//(Terabyte，太字节，或百万兆字节)=1024GB，其中1024=2^10 ( 2 的10次方)。
Expand All @@ -922,7 +922,7 @@ public static <V, K, E extends Map.Entry<K, V>> Map<K, V> toMap(Collection<E> ma
* <pre class="code">
*
* // 除数和单位的map,必须是有顺序的 从大到小.
* private static final Map<Long, String> DIVISOR_AND_UNIT_MAP = ConvertUtil.toMap(
* private static final Map{@code <Long, String>} 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，
Expand Down Expand Up @@ -1014,7 +1014,7 @@ public static <V, K> Map<K, V> toMap(Map.Entry<K, V>...mapEntrys){
* the key
* @param value
* the value
* @return the map< k, v>
* @return 将 <code>key</code> 和 <code>value</code> 直接转成map
* @see org.apache.commons.lang3.ArrayUtils#toMap(Object[])
* @since 1.7.1
*/
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/feilong/core/net/ParamUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private ParamUtil(){
* <blockquote>
*
* <pre class="code">
* 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));
Expand Down Expand Up @@ -279,15 +279,15 @@ public static String addParameterArrayValueMap(URI uri,Map<String, String[]> arr
* <blockquote>
*
* <pre class="code">
* 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));
* </pre>
*
* 返回:
*
* <pre class="code">
* 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}
* </pre>
*
* </blockquote>
Expand Down Expand Up @@ -336,7 +336,7 @@ public static String removeParameter(URI uri,String paramName,String charsetType
*
* <pre class="code">
*
* 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 <String>} paramNameList = new ArrayList{@code <String>}();
* paramNameList.add("label");
* paramNameList.add("keyword");
Expand All @@ -347,7 +347,7 @@ public static String removeParameter(URI uri,String paramName,String charsetType
* 返回:
*
* <pre class="code">
* 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}
* </pre>
*
* </blockquote>
Expand Down Expand Up @@ -426,7 +426,7 @@ private static String removeParameterList(String uriString,String queryString,Li
*
* <pre class="code">
*
* 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 <String>} paramNameList = new ArrayList{@code <String>}();
* paramNameList.add("label");
* paramNameList.add("keyword");
Expand All @@ -437,7 +437,7 @@ private static String removeParameterList(String uriString,String queryString,Li
* 返回:
*
* <pre class="code">
* {@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}
* </pre>
*
* </blockquote>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/feilong/core/util/predicate/ArrayContainsPredicate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public class ArrayContainsPredicate<T> implements Predicate<T>{

/**
* The Constructor.
*
* @param <V>
*
* @param <V>
* the value type
* @param propertyName
* 泛型T对象指定的属性名称,Possibly indexed and/or nested name of the property to be modified,参见
* <a href="../../bean/BeanUtil.html#propertyName">propertyName</a>
Expand Down

0 comments on commit 421dd33

Please sign in to comment.