From 70d99a028dc9523bc58e73419a4e98dde9930492 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 4 Aug 2020 15:06:56 -0700 Subject: [PATCH] Added try-with-resources. --- .../net/thauvin/erik/mobibot/FeedReader.java | 22 ++++++++++--------- .../commands/tell/TellMessagesMgr.java | 11 +++++----- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java index 8c58b09..41795f3 100644 --- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java +++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java @@ -81,17 +81,19 @@ public class FeedReader implements Runnable { public final void run() { try { final SyndFeedInput input = new SyndFeedInput(); - final SyndFeed feed = input.build(new XmlReader(new URL(url))); + try (final XmlReader reader = new XmlReader(new URL(url))) { + final SyndFeed feed = input.build(reader); - final List items = feed.getEntries(); - if (items.isEmpty()) { - bot.send(sender, "There is currently nothing to view.", false); - } else { - SyndEntry item; - for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) { - item = items.get(i); - bot.send(sender, item.getTitle(), false); - bot.send(sender, Utils.helpIndent(Utils.green(item.getLink()), false), false); + final List items = feed.getEntries(); + if (items.isEmpty()) { + bot.send(sender, "There is currently nothing to view.", false); + } else { + SyndEntry item; + for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) { + item = items.get(i); + bot.send(sender, item.getTitle(), false); + bot.send(sender, Utils.helpIndent(Utils.green(item.getLink()), false), false); + } } } } catch (MalformedURLException e) { diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java index b712438..a921c7c 100644 --- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java +++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java @@ -90,7 +90,7 @@ final class TellMessagesMgr { public static List load(final String file, final Logger logger) { try { try (final ObjectInput input = new ObjectInputStream( - new BufferedInputStream(Files.newInputStream(Paths.get(file))))) { + new BufferedInputStream(Files.newInputStream(Paths.get(file))))) { logger.debug("Loading the messages."); return ((List) input.readObject()); @@ -113,10 +113,11 @@ final class TellMessagesMgr { */ public static void save(final String file, final List messages, final Logger logger) { try { - try (final ObjectOutput output = new ObjectOutputStream( - new BufferedOutputStream(Files.newOutputStream(Paths.get(file))))) { - logger.debug("Saving the messages."); - output.writeObject(messages); + try (final BufferedOutputStream bos = new BufferedOutputStream(Files.newOutputStream(Paths.get(file)))) { + try (final ObjectOutput output = new ObjectOutputStream(bos)) { + logger.debug("Saving the messages."); + output.writeObject(messages); + } } } catch (IOException e) { logger.error("Unable to save messages queue.", e);