fix code

hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java

@@ -22,34 +22,38 @@ import java.util.Map.Entry;
 
 /**
  * 文件写入器
- * @author Looly
  *
+ * @author Looly
  */
-public class FileWriter extends FileWrapper{
+public class FileWriter extends FileWrapper {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 创建 FileWriter
+	 *
 	 * @param file    文件
 	 * @param charset 编码，使用 {@link CharsetUtil}
 	 * @return FileWriter
 	 */
-	public static FileWriter create(File file, Charset charset){
+	public static FileWriter create(File file, Charset charset) {
 		return new FileWriter(file, charset);
 	}
 
 	/**
 	 * 创建 FileWriter, 编码：{@link FileWrapper#DEFAULT_CHARSET}
+	 *
 	 * @param file 文件
 	 * @return FileWriter
 	 */
-	public static FileWriter create(File file){
+	public static FileWriter create(File file) {
 		return new FileWriter(file);
 	}
 
 	// ------------------------------------------------------- Constructor start
+
 	/**
 	 * 构造
+	 *
 	 * @param file    文件
 	 * @param charset 编码，使用 {@link CharsetUtil}
 	 */
@@ -60,6 +64,7 @@ public class FileWriter extends FileWrapper{
 
 	/**
 	 * 构造
+	 *
 	 * @param file    文件
 	 * @param charset 编码，使用 {@link CharsetUtil#charset(String)}
 	 */
@@ -69,6 +74,7 @@ public class FileWriter extends FileWrapper{
 
 	/**
 	 * 构造
+	 *
 	 * @param filePath 文件路径，相对路径会被转换为相对于ClassPath的路径
 	 * @param charset  编码，使用 {@link CharsetUtil}
 	 */
@@ -78,6 +84,7 @@ public class FileWriter extends FileWrapper{
 
 	/**
 	 * 构造
+	 *
 	 * @param filePath 文件路径，相对路径会被转换为相对于ClassPath的路径
 	 * @param charset  编码，使用 {@link CharsetUtil#charset(String)}
 	 */
@@ -88,6 +95,7 @@ public class FileWriter extends FileWrapper{
 	/**
 	 * 构造<br>
 	 * 编码使用 {@link FileWrapper#DEFAULT_CHARSET}
+	 *
 	 * @param file 文件
 	 */
 	public FileWriter(File file) {
@@ -97,6 +105,7 @@ public class FileWriter extends FileWrapper{
 	/**
 	 * 构造<br>
 	 * 编码使用 {@link FileWrapper#DEFAULT_CHARSET}
+	 *
 	 * @param filePath 文件路径，相对路径会被转换为相对于ClassPath的路径
 	 */
 	public FileWriter(String filePath) {
@@ -118,9 +127,9 @@ public class FileWriter extends FileWrapper{
 			writer = getWriter(isAppend);
 			writer.write(content);
 			writer.flush();
-		}catch(IOException e){
+		} catch (IOException e) {
 			throw new IORuntimeException(e);
-		}finally {
+		} finally {
 			IoUtil.close(writer);
 		}
 		return file;
@@ -197,7 +206,7 @@ public class FileWriter extends FileWrapper{
 	 * @since 3.1.0
 	 */
 	public <T> File writeLines(Collection<T> list, LineSeparator lineSeparator, boolean isAppend) throws IORuntimeException {
-		try (PrintWriter writer = getPrintWriter(isAppend)){
+		try (PrintWriter writer = getPrintWriter(isAppend)) {
 			for (T t : list) {
 				if (null != t) {
 					writer.print(t);
@@ -235,10 +244,10 @@ public class FileWriter extends FileWrapper{
 	 * @since 4.0.5
 	 */
 	public File writeMap(Map<?, ?> map, LineSeparator lineSeparator, String kvSeparator, boolean isAppend) throws IORuntimeException {
-		if(null == kvSeparator) {
+		if (null == kvSeparator) {
 			kvSeparator = " = ";
 		}
-		try(PrintWriter writer  = getPrintWriter(isAppend)) {
+		try (PrintWriter writer = getPrintWriter(isAppend)) {
 			for (Entry<?, ?> entry : map.entrySet()) {
 				if (null != entry) {
 					writer.print(StrUtil.format("{}{}{}", entry.getKey(), kvSeparator, entry.getValue()));
@@ -287,15 +296,11 @@ public class FileWriter extends FileWrapper{
 	 * @throws IORuntimeException IO异常
 	 */
 	public File write(byte[] data, int off, int len, boolean isAppend) throws IORuntimeException {
-		FileOutputStream out = null;
+		try (FileOutputStream out = new FileOutputStream(FileUtil.touch(file), isAppend)) {
-		try {
-			out = new FileOutputStream(FileUtil.touch(file), isAppend);
 			out.write(data, off, len);
 			out.flush();
-		}catch(IOException e){
+		} catch (IOException e) {
 			throw new IORuntimeException(e);
-		} finally {
-			IoUtil.close(out);
 		}
 		return file;
 	}
@@ -326,11 +331,11 @@ public class FileWriter extends FileWrapper{
 		try {
 			out = new FileOutputStream(FileUtil.touch(file));
 			IoUtil.copy(in, out);
-		}catch (IOException e) {
+		} catch (IOException e) {
 			throw new IORuntimeException(e);
 		} finally {
 			IoUtil.close(out);
-			if(isCloseIn){
+			if (isCloseIn) {
 				IoUtil.close(in);
 			}
 		}
@@ -384,22 +389,23 @@ public class FileWriter extends FileWrapper{
 	 */
 	private void checkFile() throws IORuntimeException {
 		Assert.notNull(file, "File to write content is null !");
-		if(this.file.exists() && false == file.isFile()){
+		if (this.file.exists() && false == file.isFile()) {
 			throw new IORuntimeException("File [{}] is not a file !", this.file.getAbsoluteFile());
 		}
 	}
 
 	/**
 	 * 打印新行
+	 *
 	 * @param writer        Writer
 	 * @param lineSeparator 换行符枚举
 	 * @since 4.0.5
 	 */
 	private void printNewLine(PrintWriter writer, LineSeparator lineSeparator) {
-		if(null == lineSeparator) {
+		if (null == lineSeparator) {
 			//默认换行符
 			writer.println();
-		}else {
+		} else {
 			//自定义换行符
 			writer.print(lineSeparator.getValue());
 		}

hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java

@@ -231,9 +231,6 @@ public class UploadFile {
 		} finally {
 			IoUtil.close(out);
 		}
-		// if (getFileName().length() == 0 && size == 0) {
-		// size = -1;
-		// }
 		return true;
 	}