From 4fca8310e76e5c088e47566e092200e8cef928c1 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 27 Mar 2023 02:02:10 +0800 Subject: [PATCH] fix code --- .../hutool/core/collection/iter/LineIter.java | 2 +- .../java/cn/hutool/core/compress/Deflate.java | 4 +- .../java/cn/hutool/core/compress/Gzip.java | 4 +- .../cn/hutool/core/compress/ZipReader.java | 4 +- .../java/cn/hutool/core/compress/ZipUtil.java | 4 +- .../cn/hutool/core/compress/ZipWriter.java | 4 +- .../core/convert/impl/StringConverter.java | 4 +- .../cn/hutool/core/io/CharsetDetector.java | 2 +- .../main/java/cn/hutool/core/io/IoUtil.java | 64 ++++++++++--------- .../main/java/cn/hutool/core/io/NioUtil.java | 16 ----- .../hutool/core/io/checksum/ChecksumUtil.java | 2 +- .../core/io/copy/FileChannelCopier.java | 4 +- .../cn/hutool/core/io/file/FileReader.java | 8 +-- .../cn/hutool/core/io/file/FileTypeUtil.java | 2 +- .../java/cn/hutool/core/io/file/FileUtil.java | 14 ++-- .../cn/hutool/core/io/file/FileWriter.java | 6 +- .../java/cn/hutool/core/io/file/Tailer.java | 2 +- .../hutool/core/io/stream/StreamReader.java | 2 +- .../hutool/core/io/stream/StreamWriter.java | 6 +- .../core/io/stream/SyncInputStream.java | 2 +- .../cn/hutool/core/io/watch/WatchServer.java | 2 +- .../main/java/cn/hutool/core/net/NetUtil.java | 2 +- .../hutool/core/net/multipart/UploadFile.java | 2 +- .../java/cn/hutool/core/util/RuntimeUtil.java | 6 +- .../java/cn/hutool/core/util/XmlUtil.java | 12 ++-- .../main/java/cn/hutool/crypto/KeyUtil.java | 2 +- .../main/java/cn/hutool/crypto/PemUtil.java | 4 +- .../cn/hutool/crypto/digest/Digester.java | 2 +- .../java/cn/hutool/crypto/digest/mac/Mac.java | 2 +- .../crypto/symmetric/SymmetricCrypto.java | 8 +-- .../src/main/java/cn/hutool/db/DbUtil.java | 43 ++----------- .../main/java/cn/hutool/db/DialectRunner.java | 11 ++-- .../cn/hutool/db/ThreadLocalConnection.java | 7 +- .../java/cn/hutool/db/dialect/DriverUtil.java | 15 ++--- .../cn/hutool/db/ds/AbstractDSFactory.java | 16 ++++- .../src/main/java/cn/hutool/db/ds/DSKeys.java | 47 +++++++++++--- .../main/java/cn/hutool/db/ds/DSWrapper.java | 2 +- .../java/cn/hutool/db/ds/GlobalDSFactory.java | 4 +- .../hutool/db/ds/pooled/PooledConnection.java | 18 ++++-- .../hutool/db/ds/pooled/PooledDataSource.java | 2 +- .../main/java/cn/hutool/db/meta/MetaUtil.java | 14 ++-- .../java/cn/hutool/db/sql/SqlExecutor.java | 29 ++++----- .../main/java/cn/hutool/db/sql/SqlLog.java | 44 ++++++------- .../main/java/cn/hutool/db/sql/SqlUtil.java | 8 +-- .../compress/archiver/SevenZArchiver.java | 2 +- .../compress/archiver/StreamArchiver.java | 2 +- .../compress/extractor/SevenZExtractor.java | 2 +- .../compress/extractor/StreamExtractor.java | 4 +- .../main/java/cn/hutool/extra/mail/Mail.java | 2 +- .../java/cn/hutool/extra/mail/MailUtil.java | 2 +- .../extra/servlet/JakartaServletUtil.java | 8 +-- .../cn/hutool/extra/servlet/ServletUtil.java | 8 +-- .../java/cn/hutool/extra/ssh/JschUtil.java | 6 +- .../java/cn/hutool/extra/ssh/SshjSftp.java | 2 +- .../cn/hutool/extra/template/Template.java | 2 +- .../java/cn/hutool/extra/xml/JAXBUtil.java | 2 +- .../java/cn/hutool/extra/ftp/FtpTest.java | 12 ++-- .../cn/hutool/extra/ssh/JschUtilTest.java | 2 +- .../cn/hutool/http/client/body/HttpBody.java | 2 +- .../client/body/MultipartOutputStream.java | 2 +- .../hutool/http/client/body/ResponseBody.java | 2 +- .../engine/httpclient4/HttpClient4Engine.java | 2 +- .../engine/httpclient5/HttpClient5Engine.java | 2 +- .../client/engine/jdk/JdkClientEngine.java | 4 +- .../client/engine/jdk/JdkHttpResponse.java | 2 +- .../http/server/HttpServerResponse.java | 6 +- .../cn/hutool/http/webservice/SoapClient.java | 2 +- .../java/cn/hutool/http/Issue2901Test.java | 2 +- .../hutool/log/dialect/jdk/JdkLogFactory.java | 2 +- .../java/cn/hutool/poi/csv/CsvBaseReader.java | 2 +- .../java/cn/hutool/poi/csv/CsvReader.java | 2 +- .../java/cn/hutool/poi/csv/CsvWriter.java | 2 +- .../java/cn/hutool/poi/excel/ExcelBase.java | 2 +- .../java/cn/hutool/poi/excel/ExcelWriter.java | 2 +- .../cn/hutool/poi/excel/WorkbookUtil.java | 2 +- .../poi/excel/sax/Excel03SaxReader.java | 2 +- .../poi/excel/sax/Excel07SaxReader.java | 2 +- .../hutool/poi/excel/sax/SheetRidReader.java | 2 +- .../java/cn/hutool/poi/ofd/OfdWriter.java | 2 +- .../java/cn/hutool/poi/word/Word07Writer.java | 6 +- .../java/cn/hutool/poi/csv/CsvParserTest.java | 8 +-- .../hutool/poi/excel/ExcelFileUtilTest.java | 4 +- .../java/cn/hutool/setting/GroupedSet.java | 4 +- .../main/java/cn/hutool/setting/Setting.java | 2 +- .../java/cn/hutool/setting/SettingLoader.java | 6 +- .../java/cn/hutool/setting/dialect/Props.java | 4 +- .../java/cn/hutool/setting/yaml/YamlUtil.java | 2 +- .../java/cn/hutool/socket/ChannelUtil.java | 2 +- .../java/cn/hutool/socket/aio/AioServer.java | 2 +- .../java/cn/hutool/socket/aio/AioSession.java | 2 +- .../java/cn/hutool/socket/nio/NioClient.java | 4 +- .../java/cn/hutool/socket/nio/NioServer.java | 6 +- .../cn/hutool/socket/nio/NioServerTest.java | 2 +- .../main/java/cn/hutool/swing/img/Img.java | 2 +- .../java/cn/hutool/swing/img/ImgUtil.java | 2 +- .../java/cn/hutool/swing/img/ImgWriter.java | 2 +- 96 files changed, 307 insertions(+), 315 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java index 9933dfb53..e45267c4a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java @@ -86,7 +86,7 @@ public class LineIter extends ComputeIter implements IterableIter - * 关闭失败不会抛出异常 - * - * @param closeable 被关闭的对象 - */ - public static void close(final AutoCloseable closeable) { - if (null != closeable) { - try { - closeable.close(); - } catch (final Exception e) { - // 静默关闭 - } - } - } - - /** - * 关闭
- * 关闭失败不会抛出异常 - * - * @param closeable 被关闭的对象 - * @throws IOException IO异常 - */ - public static void nullSafeClose(final Closeable closeable) throws IOException { - if (null != closeable) { - closeable.close(); - } - } - /** * 尝试关闭指定对象
* 判断对象如果实现了{@link AutoCloseable}，则调用之 @@ -922,7 +893,38 @@ public class IoUtil extends NioUtil { */ public static void closeIfPossible(final Object obj) { if (obj instanceof AutoCloseable) { - close((AutoCloseable) obj); + closeQuietly((AutoCloseable) obj); + } + } + + /** + * 按照给定顺序连续关闭一系列对象
+ * 这些对象必须按照顺序关闭，否则会出错。 + * + * @param closeables 需要关闭的对象 + */ + public static void closeQuietly(final AutoCloseable... closeables) { + for (final AutoCloseable closeable : closeables) { + if (null != closeable) { + try { + closeable.close(); + } catch (final Exception e) { + // 静默关闭 + } + } + } + } + + /** + * 关闭
+ * 关闭失败抛出{@link IOException}异常 + * + * @param closeable 被关闭的对象 + * @throws IOException IO异常 + */ + public static void nullSafeClose(final Closeable closeable) throws IOException { + if (null != closeable) { + closeable.close(); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java index bece2b04f..59cdde994 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java @@ -221,20 +221,4 @@ public class NioUtil { } return StrUtil.str(buffer, charset); } - - /** - * 关闭
- * 关闭失败不会抛出异常 - * - * @param closeable 被关闭的对象 - */ - public static void close(final AutoCloseable closeable) { - if (null != closeable) { - try { - closeable.close(); - } catch (final Exception e) { - // 静默关闭 - } - } - } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java index dafb03ad0..9eb60b72b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java @@ -81,7 +81,7 @@ public class ChecksumUtil { in = new CheckedInputStream(in, checksum); IoUtil.copy(in, EmptyOutputStream.INSTANCE); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } return checksum; } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java b/hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java index abb46642b..0d8f77811 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java @@ -73,8 +73,8 @@ public class FileChannelCopier extends IoCopier { outChannel = out.getChannel(); return copy(inChannel, outChannel); } finally { - IoUtil.close(outChannel); - IoUtil.close(inChannel); + IoUtil.closeQuietly(outChannel); + IoUtil.closeQuietly(inChannel); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java index 09150f1aa..36d2d0cdc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java @@ -81,7 +81,7 @@ public class FileReader extends FileWrapper { } catch (final Exception e) { throw new IORuntimeException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } return bytes; @@ -140,7 +140,7 @@ public class FileReader extends FileWrapper { reader = FileUtil.getReader(file, charset); IoUtil.readLines(reader, lineHandler); } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } @@ -177,7 +177,7 @@ public class FileReader extends FileWrapper { throw new UtilException(e); } } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } return result; } @@ -233,7 +233,7 @@ public class FileReader extends FileWrapper { throw new IORuntimeException(e); } finally{ if(isCloseOut){ - IoUtil.close(out); + IoUtil.closeQuietly(out); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java index 04a7803ff..8cf2e2b30 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java @@ -201,7 +201,7 @@ public class FileTypeUtil { in = IoUtil.toStream(file); return getType(in, file.getName(),isExact); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java index bb48e3fbf..9979116ea 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java @@ -249,7 +249,7 @@ public class FileUtil extends PathUtil { } catch (final IOException e) { throw new IORuntimeException(StrUtil.format("Can not read file path of [{}]", path), e); } finally { - IoUtil.close(jarFile); + IoUtil.closeQuietly(jarFile); } } @@ -1247,8 +1247,8 @@ public class FileUtil extends PathUtil { return IoUtil.contentEquals(input1, input2); } finally { - IoUtil.close(input1); - IoUtil.close(input2); + IoUtil.closeQuietly(input1); + IoUtil.closeQuietly(input2); } } @@ -1294,8 +1294,8 @@ public class FileUtil extends PathUtil { input2 = getReader(file2, charset); return IoUtil.contentEqualsIgnoreEOL(input1, input2); } finally { - IoUtil.close(input1); - IoUtil.close(input2); + IoUtil.closeQuietly(input1); + IoUtil.closeQuietly(input2); } } @@ -1676,7 +1676,7 @@ public class FileUtil extends PathUtil { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -1796,7 +1796,7 @@ public class FileUtil extends PathUtil { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java index cd51770c2..0321d1945 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java @@ -130,7 +130,7 @@ public class FileWriter extends FileWrapper { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(writer); + IoUtil.closeQuietly(writer); } return file; } @@ -344,9 +344,9 @@ public class FileWriter extends FileWrapper { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); if (isCloseIn) { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } return file; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java index e15c504ad..7e4a677dd 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java @@ -143,7 +143,7 @@ public class Tailer implements Serializable { try{ this.executorService.shutdown(); } finally { - IoUtil.close(this.randomAccessFile); + IoUtil.closeQuietly(this.randomAccessFile); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java b/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java index b29bae21d..05bb68990 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java @@ -105,7 +105,7 @@ public class StreamReader { IoUtil.copy(in, out, IoUtil.DEFAULT_BUFFER_SIZE, limit, null); } finally { if (closeAfterRead) { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } return out; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java b/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java index 9cca8f043..b936803ea 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java @@ -57,7 +57,7 @@ public class StreamWriter { throw new IORuntimeException(e); } finally { if (closeAfterWrite) { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } } @@ -82,7 +82,7 @@ public class StreamWriter { throw new IORuntimeException(e); } finally { if (closeAfterWrite) { - IoUtil.close(osw); + IoUtil.closeQuietly(osw); } } } @@ -108,7 +108,7 @@ public class StreamWriter { throw new IORuntimeException(e); } finally { if (closeAfterWrite) { - IoUtil.close(osw); + IoUtil.closeQuietly(osw); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java b/hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java index fd2673db3..689763ec4 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java @@ -87,7 +87,7 @@ public class SyncInputStream extends FilterInputStream { // 忽略读取流中的EOF错误 }finally { // 读取结束 - IoUtil.close(in); + IoUtil.closeQuietly(in); } return copyLength; } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java index fbe466ffe..604a59659 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java @@ -185,6 +185,6 @@ public class WatchServer extends Thread implements Closeable, Serializable { @Override public void close() { isClosed = true; - IoUtil.close(watchService); + IoUtil.closeQuietly(watchService); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java index a22ab2998..8a518cdc7 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java @@ -701,7 +701,7 @@ public class NetUtil { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java index 75c5dc584..f8b3a0fcb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java @@ -230,7 +230,7 @@ public class UploadFile { return false; } } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); } return true; } diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java index 90533cb95..8f341584e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java @@ -145,7 +145,7 @@ public class RuntimeUtil { in = process.getInputStream(); return IoUtil.readLines(in, charset, new ArrayList<>()); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); destroy(process); } } @@ -175,7 +175,7 @@ public class RuntimeUtil { in = process.getInputStream(); return IoUtil.read(in, charset); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); destroy(process); } } @@ -205,7 +205,7 @@ public class RuntimeUtil { in = process.getErrorStream(); return IoUtil.read(in, charset); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); destroy(process); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java index ffab70fcf..28c378b25 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java @@ -169,7 +169,7 @@ public class XmlUtil { in = FileUtil.getInputStream(file); return readXML(in); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -246,7 +246,7 @@ public class XmlUtil { in = FileUtil.getInputStream(file); readBySax(new InputSource(in), contentHandler); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -262,7 +262,7 @@ public class XmlUtil { try { readBySax(new InputSource(reader), contentHandler); } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } @@ -278,7 +278,7 @@ public class XmlUtil { try { readBySax(new InputSource(source), contentHandler); } finally { - IoUtil.close(source); + IoUtil.closeQuietly(source); } } @@ -489,7 +489,7 @@ public class XmlUtil { writer = FileUtil.getWriter(path, CharsetUtil.charset(charsetName), false); write(doc, writer, charsetName, INDENT_DEFAULT); } finally { - IoUtil.close(writer); + IoUtil.closeQuietly(writer); } } @@ -833,7 +833,7 @@ public class XmlUtil { xmlenc.writeObject(bean); } finally { // 关闭XMLEncoder会相应关闭OutputStream - IoUtil.close(xmlenc); + IoUtil.closeQuietly(xmlenc); } } diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java index 935b1025a..3fe47663c 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java @@ -730,7 +730,7 @@ public class KeyUtil { in = FileUtil.getInputStream(keyFile); return readKeyStore(type, in, password); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java index 6017e9966..439157c00 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java @@ -140,7 +140,7 @@ public class PemUtil { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(pemReader); + IoUtil.closeQuietly(pemReader); } } @@ -206,7 +206,7 @@ public class PemUtil { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(pemWriter); + IoUtil.closeQuietly(pemWriter); } } } diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java index a3c30033c..34243b23b 100755 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java @@ -218,7 +218,7 @@ public class Digester implements Serializable { in = FileUtil.getInputStream(file); return digest(in); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java index 6ec7049b0..efd0dc720 100755 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java @@ -131,7 +131,7 @@ public class Mac implements Serializable { in = FileUtil.getInputStream(file); return digest(in); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java index 87d518681..8a40514ce 100755 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java @@ -308,9 +308,9 @@ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, lock.unlock(); // issue#I4EMST@Gitee // CipherOutputStream必须关闭，才能完全写出 - IoUtil.close(cipherOutputStream); + IoUtil.closeQuietly(cipherOutputStream); if (isClose) { - IoUtil.close(data); + IoUtil.closeQuietly(data); } } } @@ -361,9 +361,9 @@ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, lock.unlock(); // issue#I4EMST@Gitee // CipherOutputStream必须关闭，才能完全写出 - IoUtil.close(cipherInputStream); + IoUtil.closeQuietly(cipherInputStream); if (isClose) { - IoUtil.close(data); + IoUtil.closeQuietly(data); } } } diff --git a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java b/hutool-db/src/main/java/cn/hutool/db/DbUtil.java index fb21a615c..3dc8dad4d 100644 --- a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/DbUtil.java @@ -1,8 +1,7 @@ package cn.hutool.db; import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.IoUtil; -import cn.hutool.db.sql.SqlLog; +import cn.hutool.db.ds.DSKeys; import cn.hutool.log.Log; import cn.hutool.log.level.Level; import cn.hutool.setting.Setting; @@ -15,38 +14,6 @@ import cn.hutool.setting.Setting; public final class DbUtil { private final static Log log = Log.get(); - /** - * 连续关闭一系列的SQL相关对象
- * 这些对象必须按照顺序关闭，否则会出错。 - * - * @param objsToClose 需要关闭的对象 - */ - public static void close(final Object... objsToClose) { - for (final Object obj : objsToClose) { - if (null != obj) { - if (obj instanceof AutoCloseable) { - IoUtil.close((AutoCloseable) obj); - } else { - log.warn("Object {} not a ResultSet or Statement or PreparedStatement or Connection!", obj.getClass().getName()); - } - } - } - } - - /** - * 移除配置文件中的Show SQL相关配置项
- * 此方法用于移除用户配置在分组下的配置项目 - * - * @param setting 配置项 - * @since 5.7.2 - */ - public static void removeShowSqlParams(final Setting setting) { - setting.remove(SqlLog.KEY_SHOW_SQL); - setting.remove(SqlLog.KEY_FORMAT_SQL); - setting.remove(SqlLog.KEY_SHOW_PARAMS); - setting.remove(SqlLog.KEY_SQL_LEVEL); - } - /** * 从配置文件中读取SQL打印选项，读取后会去除相应属性 * @@ -55,10 +22,10 @@ public final class DbUtil { */ public static void setShowSqlGlobal(final Setting setting) { // 初始化SQL显示 - final boolean isShowSql = Convert.toBoolean(setting.remove(SqlLog.KEY_SHOW_SQL), false); - final boolean isFormatSql = Convert.toBoolean(setting.remove(SqlLog.KEY_FORMAT_SQL), false); - final boolean isShowParams = Convert.toBoolean(setting.remove(SqlLog.KEY_SHOW_PARAMS), false); - String sqlLevelStr = setting.remove(SqlLog.KEY_SQL_LEVEL); + final boolean isShowSql = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_SQL), false); + final boolean isFormatSql = Convert.toBoolean(setting.remove(DSKeys.KEY_FORMAT_SQL), false); + final boolean isShowParams = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_PARAMS), false); + String sqlLevelStr = setting.remove(DSKeys.KEY_SQL_LEVEL); if (null != sqlLevelStr) { sqlLevelStr = sqlLevelStr.toUpperCase(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java b/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java index b5702de9a..3d1f702af 100644 --- a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java +++ b/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java @@ -1,5 +1,6 @@ package cn.hutool.db; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrUtil; @@ -85,7 +86,7 @@ public class DialectRunner implements Serializable { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -114,7 +115,7 @@ public class DialectRunner implements Serializable { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } else { return insertOrUpdate(conn, record, keys); @@ -168,7 +169,7 @@ public class DialectRunner implements Serializable { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -195,7 +196,7 @@ public class DialectRunner implements Serializable { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -234,7 +235,7 @@ public class DialectRunner implements Serializable { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } diff --git a/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java b/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java index 48bbc310c..8dafa37c0 100755 --- a/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java +++ b/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java @@ -1,5 +1,7 @@ package cn.hutool.db; +import cn.hutool.core.io.IoUtil; + import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; @@ -15,6 +17,9 @@ import java.util.Map; * */ public enum ThreadLocalConnection { + /** + * 单例 + */ INSTANCE; private final ThreadLocal threadLocal = new ThreadLocal<>(); @@ -97,7 +102,7 @@ public enum ThreadLocalConnection { // ignore } connMap.remove(ds); - DbUtil.close(conn); + IoUtil.closeQuietly(conn); } return this; } diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java index 0d612b4ac..bbfd00e21 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java @@ -1,16 +1,15 @@ package cn.hutool.db.dialect; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.text.StrUtil; +import cn.hutool.db.DbRuntimeException; +import cn.hutool.db.ds.DSWrapper; + +import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; -import javax.sql.DataSource; - -import cn.hutool.core.text.StrUtil; -import cn.hutool.db.DbRuntimeException; -import cn.hutool.db.DbUtil; -import cn.hutool.db.ds.DSWrapper; - /** * 驱动相关工具类，包括自动获取驱动类名 * @@ -55,7 +54,7 @@ public class DriverUtil { } driver = identifyDriver(conn); } finally { - DbUtil.close(conn); + IoUtil.closeQuietly(conn); } return driver; diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java index 0829da04b..243261b50 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java @@ -182,7 +182,7 @@ public abstract class AbstractDSFactory implements DSFactory { // 移除用户可能误加入的show sql配置项 // issue#I3VW0R@Gitee - DbUtil.removeShowSqlParams(config); + removeShowSqlParams(config); // 自动识别Driver String driver = config.getAndRemove(DSKeys.KEY_ALIAS_DRIVER); @@ -194,4 +194,18 @@ public abstract class AbstractDSFactory implements DSFactory { return DSWrapper.wrap(createDataSource(url, driver, user, pass, config), driver); } + + /** + * 移除配置文件中的Show SQL相关配置项
+ * 此方法用于移除用户配置在分组下的配置项目 + * + * @param setting 配置项 + * @since 5.7.2 + */ + private static void removeShowSqlParams(final Setting setting) { + setting.remove(DSKeys.KEY_SHOW_SQL); + setting.remove(DSKeys.KEY_FORMAT_SQL); + setting.remove(DSKeys.KEY_SHOW_PARAMS); + setting.remove(DSKeys.KEY_SQL_LEVEL); + } } diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java b/hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java index 4a18cb627..f40c28622 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java @@ -3,20 +3,47 @@ package cn.hutool.db.ds; /** * 数据源配置的字段名 * - * @since 6.0.0 * @author Looly + * @since 6.0.0 */ public interface DSKeys { - /** 某些数据库需要的特殊配置项需要的配置项 */ + /** + * 配置文件中配置属性名：是否显示SQL + */ + String KEY_SHOW_SQL = "showSql"; + /** + * 配置文件中配置属性名：是否格式化SQL + */ + String KEY_FORMAT_SQL = "formatSql"; + /** + * 配置文件中配置属性名：是否显示参数 + */ + String KEY_SHOW_PARAMS = "showParams"; + /** + * 配置文件中配置属性名：显示的日志级别 + */ + String KEY_SQL_LEVEL = "sqlLevel"; + + /** + * 某些数据库需要的特殊配置项需要的配置项 + */ String[] KEY_CONN_PROPS = {"remarks", "useInformationSchema"}; - /** 别名字段名：URL */ - String[] KEY_ALIAS_URL = { "url", "jdbcUrl" }; - /** 别名字段名：驱动名 */ - String[] KEY_ALIAS_DRIVER = { "driver", "driverClassName" }; - /** 别名字段名：用户名 */ - String[] KEY_ALIAS_USER = { "user", "username" }; - /** 别名字段名：密码 */ - String[] KEY_ALIAS_PASSWORD = { "pass", "password" }; + /** + * 别名字段名：URL + */ + String[] KEY_ALIAS_URL = {"url", "jdbcUrl"}; + /** + * 别名字段名：驱动名 + */ + String[] KEY_ALIAS_DRIVER = {"driver", "driverClassName"}; + /** + * 别名字段名：用户名 + */ + String[] KEY_ALIAS_USER = {"user", "username"}; + /** + * 别名字段名：密码 + */ + String[] KEY_ALIAS_PASSWORD = {"pass", "password"}; } diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java b/hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java index 4fff87eac..401591354 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java @@ -116,7 +116,7 @@ public class DSWrapper implements Wrapper, DataSource, Closeable, Cl @Override public void close() { if (this.ds instanceof AutoCloseable) { - IoUtil.close((AutoCloseable) this.ds); + IoUtil.closeQuietly((AutoCloseable) this.ds); } } diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java index 7fb5d4b57..88c2034cc 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java @@ -23,7 +23,7 @@ public class GlobalDSFactory { // JVM关闭时关闭所有连接池 RuntimeUtil.addShutdownHook(()->{ if (null != factory) { - IoUtil.close(factory); + IoUtil.closeQuietly(factory); StaticLog.debug("DataSource: [{}] closed.", factory.getDataSourceName()); factory = null; } @@ -68,7 +68,7 @@ public class GlobalDSFactory { return factory;// 数据源工厂不变时返回原数据源工厂 } // 自定义数据源工厂前关闭之前的数据源 - IoUtil.close(factory); + IoUtil.closeQuietly(factory); } StaticLog.debug("Custom use [{}] DataSource.", customDSFactory.getDataSourceName()); diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java index 6930991c5..c455b87c8 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java @@ -1,7 +1,7 @@ package cn.hutool.db.ds.pooled; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; -import cn.hutool.db.DbUtil; import cn.hutool.setting.dialect.Props; import java.sql.Connection; @@ -11,10 +11,10 @@ import java.util.Properties; /** * 池化 - * @author Looly * + * @author Looly */ -public class PooledConnection extends ConnectionWraper{ +public class PooledConnection extends ConnectionWraper { private final PooledDataSource ds; private boolean isClosed; @@ -41,13 +41,19 @@ public class PooledConnection extends ConnectionWraper{ // 其它参数 final Properties connProps = config.getConnProps(); - if(MapUtil.isNotEmpty(connProps)){ + if (MapUtil.isNotEmpty(connProps)) { info.putAll(connProps); } this.raw = DriverManager.getConnection(config.getUrl(), info); } + /** + * 构造 + * + * @param ds {@link PooledDataSource} + * @param conn {@link Connection} + */ public PooledConnection(final PooledDataSource ds, final Connection conn) { this.ds = ds; this.raw = conn; @@ -74,6 +80,7 @@ public class PooledConnection extends ConnectionWraper{ /** * 打开连接 + * * @return this */ protected PooledConnection open() { @@ -83,10 +90,11 @@ public class PooledConnection extends ConnectionWraper{ /** * 释放连接 + * * @return this */ protected PooledConnection release() { - DbUtil.close(this.raw); + IoUtil.closeQuietly(this.raw); return this; } } diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java index 74bb2d18d..e32a2c051 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java @@ -155,7 +155,7 @@ public class PooledDataSource extends AbstractDataSource { @Override protected void finalize() { - IoUtil.close(this); + IoUtil.closeQuietly(this); } /** diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java index 668b46bd6..ac3dec1c8 100755 --- a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java @@ -2,17 +2,13 @@ package cn.hutool.db.meta; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.StrUtil; import cn.hutool.db.DbRuntimeException; -import cn.hutool.db.DbUtil; import cn.hutool.db.Entity; import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; +import java.sql.*; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -102,7 +98,7 @@ public class MetaUtil { } catch (final Exception e) { throw new DbRuntimeException("Get tables error!", e); } finally { - DbUtil.close(conn); + IoUtil.closeQuietly(conn); } return tables; } @@ -158,7 +154,7 @@ public class MetaUtil { } catch (final Exception e) { throw new DbRuntimeException("Get columns error!", e); } finally { - DbUtil.close(conn); + IoUtil.closeQuietly(conn); } } @@ -277,7 +273,7 @@ public class MetaUtil { } catch (final SQLException e) { throw new DbRuntimeException("Get columns error!", e); } finally { - DbUtil.close(conn); + IoUtil.closeQuietly(conn); } return table; diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java index d9fd99262..c0c71fef5 100755 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java @@ -1,18 +1,13 @@ package cn.hutool.db.sql; import cn.hutool.core.collection.iter.ArrayIter; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.func.SerFunction; import cn.hutool.db.DbRuntimeException; -import cn.hutool.db.DbUtil; import cn.hutool.db.StatementUtil; import cn.hutool.db.handler.RsHandler; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.Map; /** @@ -59,7 +54,7 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -81,7 +76,7 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(call); + IoUtil.closeQuietly(call); } } @@ -150,8 +145,8 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); - DbUtil.close(rs); + IoUtil.closeQuietly(ps); + IoUtil.closeQuietly(rs); } } @@ -174,7 +169,7 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -215,7 +210,7 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(statement); + IoUtil.closeQuietly(statement); } } @@ -273,7 +268,7 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -295,7 +290,7 @@ public class SqlExecutor { ps = statementFunc.apply(conn); return executeQuery(ps, rsh); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -375,7 +370,7 @@ public class SqlExecutor { try { return query(ps, rsh, params); } finally { - DbUtil.close(ps); + IoUtil.closeQuietly(ps); } } @@ -398,7 +393,7 @@ public class SqlExecutor { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - DbUtil.close(rs); + IoUtil.closeQuietly(rs); } } // -------------------------------------------------------------------------------------------------------------------------------- Private method end diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java index 4922d82ba..9a3926846 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java @@ -11,43 +11,37 @@ import cn.hutool.log.level.Level; * @since 4.1.0 */ public enum SqlLog { + /** + * 单例 + */ INSTANCE; - /** - * 配置文件中配置属性名：是否显示SQL - */ - public static final String KEY_SHOW_SQL = "showSql"; - /** - * 配置文件中配置属性名：是否格式化SQL - */ - public static final String KEY_FORMAT_SQL = "formatSql"; - /** - * 配置文件中配置属性名：是否显示参数 - */ - public static final String KEY_SHOW_PARAMS = "showParams"; - /** - * 配置文件中配置属性名：显示的日志级别 - */ - public static final String KEY_SQL_LEVEL = "sqlLevel"; - private final static Log log = LogFactory.get(); - /** 是否debugSQL */ + /** + * 是否debugSQL + */ private boolean showSql; - /** 是否格式化SQL */ + /** + * 是否格式化SQL + */ private boolean formatSql; - /** 是否显示参数 */ + /** + * 是否显示参数 + */ private boolean showParams; - /** 默认日志级别 */ + /** + * 默认日志级别 + */ private Level level = Level.DEBUG; /** * 设置全局配置：是否通过debug日志显示SQL * - * @param isShowSql 是否显示SQL - * @param isFormatSql 是否格式化显示的SQL + * @param isShowSql 是否显示SQL + * @param isFormatSql 是否格式化显示的SQL * @param isShowParams 是否打印参数 - * @param level 日志级别 + * @param level 日志级别 */ public void init(final boolean isShowSql, final boolean isFormatSql, final boolean isShowParams, final Level level) { this.showSql = isShowSql; @@ -81,7 +75,7 @@ public enum SqlLog { /** * 打印SQL日志 * - * @param sql SQL语句 + * @param sql SQL语句 * @param paramValues 参数，可为null */ public void log(final String sql, final Object paramValues) { diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java index 74475d151..e7a718bfe 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java @@ -161,7 +161,7 @@ public class SqlUtil { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } @@ -181,7 +181,7 @@ public class SqlUtil { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -204,9 +204,9 @@ public class SqlUtil { } catch (final SQLException e) { throw new DbRuntimeException(e); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); if (closeAfterUse) { - IoUtil.close(dataStream); + IoUtil.closeQuietly(dataStream); } } return blob; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java index 31650006f..d855f0698 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java @@ -110,7 +110,7 @@ public class SevenZArchiver implements Archiver { throw new IORuntimeException(e); } } - IoUtil.close(this.sevenZOutputFile); + IoUtil.closeQuietly(this.sevenZOutputFile); } /** diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java index 66ce4bbb3..00317ebcf 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java @@ -145,7 +145,7 @@ public class StreamArchiver implements Archiver { } catch (final Exception ignore) { //ignore } - IoUtil.close(this.out); + IoUtil.closeQuietly(this.out); } /** diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java index adf8cc73c..c2fa359c9 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java @@ -158,6 +158,6 @@ public class SevenZExtractor implements Extractor, RandomAccess { @Override public void close() { - IoUtil.close(this.sevenZFile); + IoUtil.closeQuietly(this.sevenZFile); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java index 459d55869..1907f8629 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java @@ -90,7 +90,7 @@ public class StreamExtractor implements Extractor { } } catch (final ArchiveException e) { // issue#2384，如果报错可能持有文件句柄，导致无法删除文件 - IoUtil.close(in); + IoUtil.closeQuietly(in); throw new CompressException(e); } } @@ -168,6 +168,6 @@ public class StreamExtractor implements Extractor { @Override public void close() { - IoUtil.close(this.in); + IoUtil.closeQuietly(this.in); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java index 24b8d52a9..a399589b3 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java @@ -294,7 +294,7 @@ public class Mail implements Builder { in = FileUtil.getInputStream(imageFile); return addImage(cid, in, FileTypeMap.getDefaultFileTypeMap().getContentType(imageFile)); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java index 1ac72b4b6..ec1f3bd81 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java @@ -411,7 +411,7 @@ public class MailUtil { for (final Entry entry : imageMap.entrySet()) { mail.addImage(entry.getKey(), entry.getValue()); // 关闭流 - IoUtil.close(entry.getValue()); + IoUtil.closeQuietly(entry.getValue()); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java index b036c7326..6b09095a4 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java @@ -566,7 +566,7 @@ public class JakartaServletUtil { } catch (final IOException e) { throw new UtilException(e); } finally { - IoUtil.close(writer); + IoUtil.closeQuietly(writer); } } @@ -585,7 +585,7 @@ public class JakartaServletUtil { in = FileUtil.getInputStream(file); write(response, in, contentType, fileName); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -658,8 +658,8 @@ public class JakartaServletUtil { } catch (final IOException e) { throw new UtilException(e); } finally { - IoUtil.close(out); - IoUtil.close(in); + IoUtil.closeQuietly(out); + IoUtil.closeQuietly(in); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java index a6d6325b0..cce1efd94 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java @@ -565,7 +565,7 @@ public class ServletUtil { } catch (final IOException e) { throw new UtilException(e); } finally { - IoUtil.close(writer); + IoUtil.closeQuietly(writer); } } @@ -584,7 +584,7 @@ public class ServletUtil { in = FileUtil.getInputStream(file); write(response, in, contentType, fileName); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -657,8 +657,8 @@ public class ServletUtil { } catch (final IOException e) { throw new UtilException(e); } finally { - IoUtil.close(out); - IoUtil.close(in); + IoUtil.closeQuietly(out); + IoUtil.closeQuietly(in); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java index 8121b371c..b97df1e2a 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java @@ -477,7 +477,7 @@ public class JschUtil { } catch (final JSchException e) { throw new JschRuntimeException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); close(channel); } } @@ -511,8 +511,8 @@ public class JschUtil { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(out); - IoUtil.close(in); + IoUtil.closeQuietly(out); + IoUtil.closeQuietly(in); close(shell); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java index 36d843b82..4f46b5320 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java @@ -255,7 +255,7 @@ public class SshjSftp extends AbstractFtp { } catch (final Exception e) { throw new FtpException(e); } finally { - IoUtil.close(session); + IoUtil.closeQuietly(session); } } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/Template.java b/hutool-extra/src/main/java/cn/hutool/extra/template/Template.java index be7f4d4f7..6358f420c 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/Template.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/Template.java @@ -45,7 +45,7 @@ public interface Template { out = FileUtil.getOutputStream(file); this.render(bindingMap, out); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java index 9a1cf4b30..08d741400 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java @@ -115,7 +115,7 @@ public class JAXBUtil { } catch (final Exception e) { throw new RuntimeException("convertToJava2 错误：" + e.getMessage(), e); } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java index b867c7004..ddc5b3fe0 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java @@ -19,7 +19,7 @@ public class FtpTest { ftp.cd("/file/aaa"); Console.log(ftp.pwd()); - IoUtil.close(ftp); + IoUtil.closeQuietly(ftp); } @Test @@ -30,7 +30,7 @@ public class FtpTest { final boolean upload = ftp.uploadFile("/temp", FileUtil.file("d:/test/test.zip")); Console.log(upload); - IoUtil.close(ftp); + IoUtil.closeQuietly(ftp); } @Test @@ -54,7 +54,7 @@ public class FtpTest { Console.log("打印pwd: " + ftp.pwd()); - IoUtil.close(ftp); + IoUtil.closeQuietly(ftp); } @Test @@ -63,7 +63,7 @@ public class FtpTest { final Ftp ftp = new Ftp("looly.centos"); ftp.recursiveDownloadFolder("/",FileUtil.file("d:/test/download")); - IoUtil.close(ftp); + IoUtil.closeQuietly(ftp); } @Test @@ -75,7 +75,7 @@ public class FtpTest { Console.log(ftp.pwd()); ftp.recursiveDownloadFolder("/",FileUtil.file("d:/test/download")); - IoUtil.close(ftp); + IoUtil.closeQuietly(ftp); } @Test @@ -90,7 +90,7 @@ public class FtpTest { FileUtil.file("d:/test/download/" + name)); } - IoUtil.close(ftp); + IoUtil.closeQuietly(ftp); } @Test diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java index 300886ca9..b03927c55 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java @@ -71,7 +71,7 @@ public class JschUtilTest { Console.log("打印pwd: " + sftp.pwd()); - IoUtil.close(sftp); + IoUtil.closeQuietly(sftp); } @Test diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java b/hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java index aa755f8ef..b2d1d0dd5 100644 --- a/hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java @@ -50,7 +50,7 @@ public interface HttpBody { try { write(out); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java b/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java index 24627c79e..6f8325bd5 100644 --- a/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java @@ -127,7 +127,7 @@ public class MultipartOutputStream extends OutputStream { @Override public void close() { finish(); - IoUtil.close(this.out); + IoUtil.closeQuietly(this.out); } /** diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java b/hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java index c73eea208..d20ef5851 100755 --- a/hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java @@ -106,7 +106,7 @@ public class ResponseBody implements HttpBody, Closeable { return this.bodyStream.copyTo(out, streamProgress); } finally { if (isCloseOut) { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } } diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java b/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java index 357a00b2b..fcdebe829 100755 --- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java @@ -48,7 +48,7 @@ public class HttpClient4Engine implements ClientEngine { public HttpClient4Engine setConfig(final ClientConfig config) { this.config = config; // 重置客户端 - IoUtil.close(this.engine); + IoUtil.closeQuietly(this.engine); this.engine = null; return this; } diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java b/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java index 9ab0d8609..8e084553b 100755 --- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java @@ -53,7 +53,7 @@ public class HttpClient5Engine implements ClientEngine { public HttpClient5Engine setConfig(final ClientConfig config) { this.config = config; // 重置客户端 - IoUtil.close(this.engine); + IoUtil.closeQuietly(this.engine); this.engine = null; return this; } diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java b/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java index 7689f13f2..5c35cd85a 100755 --- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java @@ -66,7 +66,7 @@ public class JdkClientEngine implements ClientEngine { doSend(message); } catch (final IOException e) { // 出错后关闭连接 - IoUtil.close(this); + IoUtil.closeQuietly(this); throw new RuntimeException(e); } @@ -110,7 +110,7 @@ public class JdkClientEngine implements ClientEngine { */ private void initConn(final Request message) { // 执行下次请求时自动关闭上次请求（常用于转发） - IoUtil.close(this); + IoUtil.closeQuietly(this); this.conn = buildConn(message); } diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java index 18fac5c26..d2c02a662 100644 --- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java +++ b/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java @@ -202,7 +202,7 @@ public class JdkHttpResponse implements Response, Closeable { @Override public void close() { // 关闭流 - IoUtil.close(this.body); + IoUtil.closeQuietly(this.body); // 关闭连接 this.httpConnection.disconnectQuietly(); } diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java index 07d69cc9e..670317ae8 100644 --- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java +++ b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java @@ -351,8 +351,8 @@ public class HttpServerResponse extends HttpServerBase { out = this.httpExchange.getResponseBody(); IoUtil.copy(in, out); } finally { - IoUtil.close(out); - IoUtil.close(in); + IoUtil.closeQuietly(out); + IoUtil.closeQuietly(in); } return this; } @@ -391,7 +391,7 @@ public class HttpServerResponse extends HttpServerBase { in = FileUtil.getInputStream(file); write(in, (int)fileSize, contentType, fileName); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } return this; } diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java index 896e2d582..d4d98f02c 100644 --- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java +++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java @@ -540,7 +540,7 @@ public class SoapClient implements HeaderOperation { } catch (final IOException | SOAPException e) { throw new SoapRuntimeException(e); } finally { - IoUtil.close(res); + IoUtil.closeQuietly(res); } } diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java b/hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java index 58d7e43a1..6f5ba7e49 100644 --- a/hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java +++ b/hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java @@ -25,6 +25,6 @@ public class Issue2901Test { .send(); Console.log(res.bodyStr()); - IoUtil.close(res); + IoUtil.closeQuietly(res); } } diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java index 3f2bcfa58..66d6cb496 100755 --- a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java +++ b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java @@ -53,7 +53,7 @@ public class JdkLogFactory extends LogFactory{ Console.error(e, "Read [logging.properties] from [%JRE_HOME%/lib/logging.properties] error!"); } } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java index 609167f7f..e03868797 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java @@ -263,7 +263,7 @@ public class CsvBaseReader implements Serializable { rowHandler.accept(csvParser.next()); } } finally { - IoUtil.close(csvParser); + IoUtil.closeQuietly(csvParser); } } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java index 9589ddcbe..dae0a456f 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java @@ -143,6 +143,6 @@ public class CsvReader extends CsvBaseReader implements Iterable, Closea @Override public void close() { - IoUtil.close(this.reader); + IoUtil.closeQuietly(this.reader); } } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java index 160fb1bc2..cec33e071 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java @@ -344,7 +344,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable { @Override public void close() { - IoUtil.close(this.writer); + IoUtil.closeQuietly(this.writer); } @Override diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java index 6b81033b1..267d821e7 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java @@ -505,7 +505,7 @@ public class ExcelBase> implements Closeable { */ @Override public void close() { - IoUtil.close(this.workbook); + IoUtil.closeQuietly(this.workbook); this.sheet = null; this.workbook = null; this.isClosed = true; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java index bf7c0cd98..70a5f5ed5 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java @@ -1321,7 +1321,7 @@ public class ExcelWriter extends ExcelBase { throw new IORuntimeException(e); } finally { if (isCloseOut) { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } return this; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java index 0f743b46f..e5dc5a23a 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java @@ -147,7 +147,7 @@ public class WorkbookUtil { } catch (final Exception e) { throw new POIException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java index 47210efc5..0052f2d24 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java @@ -148,7 +148,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader { } catch (final Exception e) { throw new POIException(e); } finally { - IoUtil.close(sheetInputStream); + IoUtil.closeQuietly(sheetInputStream); } return this; } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java index 23fb8e29d..6d9c010bf 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java @@ -69,7 +69,7 @@ public class SheetRidReader extends DefaultHandler { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(workbookData); + IoUtil.closeQuietly(workbookData); } return this; } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java index 0bb310e30..34fb8c94b 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java @@ -142,6 +142,6 @@ public class OfdWriter implements Serializable, Closeable { @Override public void close() { - IoUtil.close(this.doc); + IoUtil.closeQuietly(this.doc); } } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java b/hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java index 5e390ea64..80c3a3da5 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java @@ -208,7 +208,7 @@ public class Word07Writer implements Closeable { } catch (final IOException e) { throw new IORuntimeException(e); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } return this; @@ -267,7 +267,7 @@ public class Word07Writer implements Closeable { throw new IORuntimeException(e); } finally { if (isCloseOut) { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } return this; @@ -289,7 +289,7 @@ public class Word07Writer implements Closeable { * 关闭Word文档但是不写出 */ protected void closeWithoutFlush() { - IoUtil.close(this.doc); + IoUtil.closeQuietly(this.doc); this.isClosed = true; } } diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java index da204882d..5ef6f1d75 100755 --- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java @@ -16,7 +16,7 @@ public class CsvParserTest { final CsvRow row = parser.nextRow(); //noinspection ConstantConditions Assert.assertEquals("b\"bba\"", row.getRawList().get(1)); - IoUtil.close(parser); + IoUtil.closeQuietly(parser); } @Test @@ -26,7 +26,7 @@ public class CsvParserTest { final CsvRow row = parser.nextRow(); //noinspection ConstantConditions Assert.assertEquals("\"bba\"bbb", row.getRawList().get(1)); - IoUtil.close(parser); + IoUtil.closeQuietly(parser); } @Test @@ -36,7 +36,7 @@ public class CsvParserTest { final CsvRow row = parser.nextRow(); //noinspection ConstantConditions Assert.assertEquals("bba", row.getRawList().get(1)); - IoUtil.close(parser); + IoUtil.closeQuietly(parser); } @Test @@ -46,7 +46,7 @@ public class CsvParserTest { final CsvRow row = parser.nextRow(); //noinspection ConstantConditions Assert.assertEquals("", row.getRawList().get(1)); - IoUtil.close(parser); + IoUtil.closeQuietly(parser); } @Test diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java index 4b9a9f07c..d1054ba63 100755 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java @@ -16,7 +16,7 @@ public class ExcelFileUtilTest { Assert.assertTrue(ExcelFileUtil.isXls(in)); Assert.assertFalse(ExcelFileUtil.isXlsx(in)); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } @@ -27,7 +27,7 @@ public class ExcelFileUtilTest { Assert.assertFalse(ExcelFileUtil.isXls(in)); Assert.assertTrue(ExcelFileUtil.isXlsx(in)); } finally { - IoUtil.close(in); + IoUtil.closeQuietly(in); } } } diff --git a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java b/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java index c6db13f82..321c38066 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java @@ -166,7 +166,7 @@ public class GroupedSet extends HashMap> { // log.error(e, "Load GroupSet error!"); return false; } finally { - IoUtil.close(settingStream); + IoUtil.closeQuietly(settingStream); } return true; } @@ -229,7 +229,7 @@ public class GroupedSet extends HashMap> { valueSet.add(line); } } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } diff --git a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java index 705f9079d..9cec6827a 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java @@ -222,7 +222,7 @@ public class Setting extends AbsSetting implements Map { this.watchMonitor.start(); StaticLog.debug("Auto load for [{}] listenning...", this.resource.getUrl()); } else { - IoUtil.close(this.watchMonitor); + IoUtil.closeQuietly(this.watchMonitor); this.watchMonitor = null; } } diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java index e8a8169e2..af2e1497c 100755 --- a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java @@ -88,7 +88,7 @@ public class SettingLoader { log.error(e, "Load setting error!"); return false; } finally { - IoUtil.close(settingStream); + IoUtil.closeQuietly(settingStream); } return true; } @@ -140,7 +140,7 @@ public class SettingLoader { this.groupedMap.put(group, keyValue[0].trim(), value); } } finally { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } @@ -189,7 +189,7 @@ public class SettingLoader { writer = FileUtil.getPrintWriter(file, charset, false); store(writer); } finally { - IoUtil.close(writer); + IoUtil.closeQuietly(writer); } } diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java index 678f74a10..160786a7b 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java @@ -219,7 +219,7 @@ public final class Props extends Properties implements TypeGetter }); this.watchMonitor.start(); } else { - IoUtil.close(this.watchMonitor); + IoUtil.closeQuietly(this.watchMonitor); this.watchMonitor = null; } } @@ -399,7 +399,7 @@ public final class Props extends Properties implements TypeGetter } catch (final IOException e) { throw new IORuntimeException(e, "Store properties to [{}] error!", absolutePath); } finally { - IoUtil.close(writer); + IoUtil.closeQuietly(writer); } } diff --git a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java b/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java index df49e38c8..7c662b07d 100755 --- a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java @@ -96,7 +96,7 @@ public class YamlUtil { return yaml.loadAs(reader, type); } finally { if (isCloseReader) { - IoUtil.close(reader); + IoUtil.closeQuietly(reader); } } } diff --git a/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java b/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java index 39382ca65..38ee80f90 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java @@ -54,7 +54,7 @@ public class ChannelUtil { try { channel.connect(address).get(); } catch (final InterruptedException | ExecutionException e) { - IoUtil.close(channel); + IoUtil.closeQuietly(channel); throw new SocketRuntimeException(e); } return channel; diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java index 9181e3c01..286308103 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java @@ -147,7 +147,7 @@ public class AioServer implements Closeable { */ @Override public void close() { - IoUtil.close(this.channel); + IoUtil.closeQuietly(this.channel); if (null != this.group && false == this.group.isShutdown()) { try { diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java index 277827002..32692d1b0 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java @@ -199,7 +199,7 @@ public class AioSession implements Closeable{ */ @Override public void close() { - IoUtil.close(this.channel); + IoUtil.closeQuietly(this.channel); this.readBuffer = null; this.writeBuffer = null; } diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java b/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java index fd53eeb0e..707033096 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java @@ -161,7 +161,7 @@ public class NioClient implements Closeable { @Override public void close() { - IoUtil.close(this.selector); - IoUtil.close(this.channel); + IoUtil.closeQuietly(this.selector); + IoUtil.closeQuietly(this.channel); } } diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java b/hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java index 204a18cae..04cf1ae97 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java @@ -140,7 +140,7 @@ public class NioServer implements Closeable { try{ handler.handle(socketChannel); } catch (final Exception e){ - IoUtil.close(socketChannel); + IoUtil.closeQuietly(socketChannel); log.error(e); } } @@ -148,7 +148,7 @@ public class NioServer implements Closeable { @Override public void close() { - IoUtil.close(this.selector); - IoUtil.close(this.serverSocketChannel); + IoUtil.closeQuietly(this.selector); + IoUtil.closeQuietly(this.serverSocketChannel); } } diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java index 6703d6119..1ce6e3ee7 100755 --- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java +++ b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java @@ -33,7 +33,7 @@ public class NioServerTest { doWrite(sc, body); } else if (readBytes < 0) { - IoUtil.close(sc); + IoUtil.closeQuietly(sc); } } catch (final IOException e){ throw new IORuntimeException(e); diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java b/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java index 68ba7f834..9acc97cc8 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java @@ -751,7 +751,7 @@ public class Img implements Serializable { out = ImgUtil.getImageOutputStream(targetFile); write(out); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); } } diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java index fccd96d5a..1959c54f2 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java @@ -514,7 +514,7 @@ public class ImgUtil { imageOutputStream = getImageOutputStream(destImageFile); convert(read(srcImageFile), destExtName, imageOutputStream, StrUtil.equalsIgnoreCase(IMAGE_TYPE_PNG, srcExtName)); } finally { - IoUtil.close(imageOutputStream); + IoUtil.closeQuietly(imageOutputStream); } } diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java index 506fc39c2..f3d9bb75c 100644 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java @@ -96,7 +96,7 @@ public class ImgWriter { out = ImgUtil.getImageOutputStream(targetFile); write(out); } finally { - IoUtil.close(out); + IoUtil.closeQuietly(out); } }