diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java index 2c7b01098..24edba363 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java @@ -212,6 +212,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable { * * @param csvData CsvData * @return this + * @since 5.7.4 */ public CsvWriter write(CsvData csvData) { if (csvData != null) { diff --git a/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java index fe2d06eb9..e025df70f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java @@ -33,15 +33,15 @@ public class JAXBUtil { /** * JavaBean转换成xml - * + *
* bean上面用的常用注解
+ *
+ * @param bean Bean对象
+ * @return 输出的XML字符串
* @see XmlRootElement @XmlRootElement(name = "school")
* @see XmlElement @XmlElement(name = "school_name", required = true)
* @see XmlElementWrapper @XmlElementWrapper(name="schools")
* @see XmlTransient JAXB "有两个名为 "**" 的属性,类的两个属性具有相同名称 "**""解决方案
- *
- * @param bean Bean对象
- * @return 输出的XML字符串
*/
public static String beanToXml(Object bean) {
return beanToXml(bean, CharsetUtil.CHARSET_UTF_8, true);
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
index 4c12ec193..10445a0cf 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
@@ -11,7 +11,10 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
public class CsvUtilTest {
@@ -160,10 +163,10 @@ public class CsvUtilTest {
headMap.put("username", 1);
headMap.put("mobile", 2);
- for (int i = 0; i < datas.size(); i++) {
- User user = datas.get(i);
+ for (User user : datas) {
// row.size() + 1, 表示从第2行开始,第一行是标题栏
- row.add(new CsvRow(row.size() + 1, headMap, ListUtil.toList(BeanUtil.beanToMap(user).values()).stream().map(Object::toString).collect(Collectors.toList())));
+ row.add(new CsvRow(row.size() + 1, headMap,
+ BeanUtil.beanToMap(user).values().stream().map(Object::toString).collect(Collectors.toList())));
}
CsvData csvData = new CsvData(header, row);