diff --git a/common/src/main/java/com/xypower/common/FilesUtils.java b/common/src/main/java/com/xypower/common/FilesUtils.java index 730bf812..156f4cba 100644 --- a/common/src/main/java/com/xypower/common/FilesUtils.java +++ b/common/src/main/java/com/xypower/common/FilesUtils.java @@ -131,13 +131,7 @@ public class FilesUtils { } catch (Exception ex) { } finally { - if (fileOutputStream != null) { - try { - fileOutputStream.close(); - } catch (Exception ex) { - - } - } + closeFriendly(fileOutputStream); } } @@ -158,9 +152,9 @@ public class FilesUtils { BufferedReader bufferedReader = null; StringBuilder stringBuilder = null; try { - File appCfgFile = new File(path); - if (appCfgFile.exists()) { - fis = new FileInputStream(appCfgFile); + File file = new File(path); + if (file.exists()) { + fis = new FileInputStream(file); inputStreamReader = new InputStreamReader(fis, "UTF-8"); bufferedReader = new BufferedReader(inputStreamReader); stringBuilder = new StringBuilder(); @@ -174,27 +168,33 @@ public class FilesUtils { } catch (Exception e) { e.printStackTrace(); } finally { - if (bufferedReader != null) { - try { - bufferedReader.close(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - if (inputStreamReader != null) { - try { - inputStreamReader.close(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - if (fis != null) { - try { - fis.close(); - } catch (Exception ex) { - ex.printStackTrace(); - } + closeFriendly(bufferedReader); + closeFriendly(inputStreamReader); + closeFriendly(fis); + } + + return stringBuilder == null ? null : stringBuilder.toString(); + } + + public static String readTextFile(InputStream inputStream) { + InputStreamReader inputStreamReader = null; + BufferedReader bufferedReader = null; + StringBuilder stringBuilder = null; + try { + inputStreamReader = new InputStreamReader(inputStream, "UTF-8"); + bufferedReader = new BufferedReader(inputStreamReader); + stringBuilder = new StringBuilder(); + String line; + while ((line = bufferedReader.readLine()) != null) { + stringBuilder.append(line); } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeFriendly(bufferedReader); + closeFriendly(inputStreamReader); } return stringBuilder == null ? null : stringBuilder.toString();