upgrade-version-1.8.2

ifeilong · Jul 28, 2016 · e64594d · e64594d
1 parent 51e1edd
commit e64594d
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ feilong-core jar 你可以在这里 https://github.com/venusdrogon/feilong-platf
 
 		....
 		<properties>
-			<version.feilong-platform>1.8.1</version.feilong-platform>
+			<version.feilong-platform>1.8.2</version.feilong-platform>
 			....
 		</properties>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.feilong.platform</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.8.2-SNAPSHOT</version>
+		<version>1.8.2</version>
 	</parent>
 
 	<artifactId>feilong-core</artifactId>

diff --git a/src/main/java/com/feilong/core/bean/ConvertUtil.java b/src/main/java/com/feilong/core/bean/ConvertUtil.java
@@ -1371,7 +1371,7 @@ public static <T> List<T> toList(T...arrays){
      * 
      * <pre class="code">
      * 
-     * public static {@code <K, V>} Map<K, V[]> toArrayValueMap(Map{@code <K, V>} singleValueMap){
+     * public static {@code <K, V>} Map{@code <K, V[]>} toArrayValueMap(Map{@code <K, V>} singleValueMap){
      *     Map{@code <K, V[]>} arrayValueMap = newLinkedHashMap(singleValueMap.size());//保证顺序和参数singleValueMap顺序相同
      *     for (Map.Entry{@code <K, V>} entry : singleValueMap.entrySet()){
      *         arrayValueMap.put(entry.getKey(), toArray(entry.getValue()));//注意此处的Value不要声明成V,否则会变成Object数组

diff --git a/src/main/java/com/feilong/core/lang/ObjectUtil.java b/src/main/java/com/feilong/core/lang/ObjectUtil.java
@@ -101,7 +101,7 @@ private ObjectUtil(){
      * 
      * <pre class="code">
      * 
-     * private void putItemToMap(Map<String, List<Item>> map,String categoryName,Item item){
+     * private void putItemToMap(Map{@code <String, List<Item>>} map,String categoryName,Item item){
      *     List{@code <Item>} itemList = map.get(categoryName);
      * 
      *     if (isNullOrEmpty(itemList)){
@@ -117,7 +117,7 @@ private ObjectUtil(){
      * 
      * <pre class="code">
      * 
-     * private void putItemToMap(Map<String, List<Item>> map,String categoryName,Item item){
+     * private void putItemToMap(Map{@code <String, List<Item>>} map,String categoryName,Item item){
      *     List{@code <Item>} itemList = ObjectUtil.defaultIfNullOrEmpty(map.get(categoryName), new ArrayList{@code <Item>}());
      *     itemList.add(item);
      *     map.put(categoryName, itemList);

diff --git a/src/main/java/com/feilong/core/util/CollectionsUtil.java b/src/main/java/com/feilong/core/util/CollectionsUtil.java
@@ -353,7 +353,7 @@ public static <O> boolean addAllIgnoreNull(final Collection<O> objectCollection,
      * 
      * <pre class="code">
      * 
-     * List<Object[]> dataList = new ArrayList<>();
+     * List{@code <Object[]>} dataList = new ArrayList{@code <>}();
      * for (T bean : iterable){
      *     Object[] objectArray = toObjectArray(bean, propertyNameList);
      *     if (isNotNullOrEmpty(objectArray)){
@@ -368,7 +368,7 @@ public static <O> boolean addAllIgnoreNull(final Collection<O> objectCollection,
      * 
      * <pre class="code">
      * 
-     * List<Object[]> dataList = new ArrayList<>();
+     * List{@code <Object[]>} dataList = new ArrayList{@code <>}();
      * for (T bean : iterable){
      *     addIgnoreNullOrEmpty(dataList, toObjectArray(bean, propertyNameList));
      * }

diff --git a/src/main/java/com/feilong/core/util/predicate/BeanPredicateUtil.java b/src/main/java/com/feilong/core/util/predicate/BeanPredicateUtil.java
@@ -160,22 +160,22 @@ public boolean evaluate(V propertyValue){
      * 
      * <tr valign="top" style="background-color:#eeeeff">
      * <td>{@link Criterion#LESS}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) < 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code <} 0</td>
      * </tr>
      * 
      * <tr valign="top">
      * <td>{@link Criterion#GREATER}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) > 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code >} 0</td>
      * </tr>
      * 
      * <tr valign="top" style="background-color:#eeeeff">
      * <td>{@link Criterion#GREATER_OR_EQUAL}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) >= 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code >=} 0</td>
      * </tr>
      * 
      * <tr valign="top">
      * <td>{@link Criterion#LESS_OR_EQUAL}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) <= 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code <=} 0</td>
      * </tr>
      * 
      * </table>
@@ -270,22 +270,22 @@ public static <T, V extends Comparable<? super V>> Predicate<T> comparatorPredic
      * 
      * <tr valign="top" style="background-color:#eeeeff">
      * <td>{@link Criterion#LESS}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) < 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code <} 0</td>
      * </tr>
      * 
      * <tr valign="top">
      * <td>{@link Criterion#GREATER}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) > 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code >} 0</td>
      * </tr>
      * 
      * <tr valign="top" style="background-color:#eeeeff">
      * <td>{@link Criterion#GREATER_OR_EQUAL}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) >= 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code >=} 0</td>
      * </tr>
      * 
      * <tr valign="top">
      * <td>{@link Criterion#LESS_OR_EQUAL}</td>
-     * <td>comparator.compare(valueToCompare, propertyValue) <= 0</td>
+     * <td>comparator.compare(valueToCompare, propertyValue) {@code <=} 0</td>
      * </tr>
      * 
      * </table>

diff --git a/src/main/java/com/feilong/tools/formatter/FormatterColumn.java b/src/main/java/com/feilong/tools/formatter/FormatterColumn.java
@@ -51,11 +51,15 @@
 
     /**
      * (Optional) The name of the column. Defaults to the property or field name.
+     *
+     * @return the string
      */
     String name() default "";
 
     /**
      * (Optional) 排序,数值从小到大排序.
+     *
+     * @return the int
      */
     int order() default 0;
 }
diff --git a/src/main/java/com/feilong/tools/formatter/FormatterUtil.java b/src/main/java/com/feilong/tools/formatter/FormatterUtil.java
@@ -145,8 +145,8 @@ public static final <T> String formatToSimpleTable(Iterable<T> iterable,BeanForm
      * 
      * String[] columnTitles = { "name", "age", "address" };
      * 
-     * List<Object[]> list = new ArrayList<>();
-     * for (int i = 0; i < 5; i++){
+     * List{@code <Object[]>} list = new ArrayList{@code <>}();
+     * for (int i = 0; i {@code <} 5; i++){
      *     list.add(ConvertUtil.toArray("feilong" + i, 18 + i, "shanghai"));
      * }
      * 

diff --git a/src/main/java/com/feilong/tools/jsonlib/JsonUtil.java b/src/main/java/com/feilong/tools/jsonlib/JsonUtil.java
@@ -511,10 +511,10 @@ private static JsonFormatConfig buildJsonFormatConfig(String[] excludes,String[]
      * 
      * <pre class="code">
      * 
-     * //查询 >10 的元素
-     * Predicate<Integer> predicate = new ComparatorPredicate<Integer>(10, ComparatorUtils.<Integer> naturalComparator(), Criterion.LESS);
+     * //查询{@code  >10} 的元素
+     * Predicate{@code <Integer>} predicate = new ComparatorPredicate{@code <Integer>}(10, ComparatorUtils.{@code <Integer>} naturalComparator(), Criterion.LESS);
      * 
-     * List<Integer> result = CollectionsUtil.select(toList(1, 5, 10, 30, 55, 88, 1, 12, 3), predicate);
+     * List{@code <Integer>} result = CollectionsUtil.select(toList(1, 5, 10, 30, 55, 88, 1, 12, 3), predicate);
      * LOGGER.debug(JsonUtil.format(result, 0, 0));
      * 
      * </pre>