X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderImpl.java;h=43a87fbf4fbc0af2623945069022c8e80934cfde;hp=ba1c632460f836ab32b8245eec5fc635e7cfb252;hb=HEAD;hpb=981d31bd43cae0ebd74a2e4bb053a4b77c0be094

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
index ba1c632..43a87fb 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneDownloaderImpl.java - Copyright © 2010–2019 David Roden
+ * Sone - SoneDownloaderImpl.java - Copyright © 2010–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
 
 package net.pterodactylus.sone.core;
 
-import static freenet.support.io.Closer.close;
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
 import static java.util.concurrent.TimeUnit.DAYS;
@@ -183,23 +182,19 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	 * @return The parsed Sone, or {@code null} if the Sone could not be parsed
 	 */
 	private Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) {
-		logger.log(Level.FINEST, String.format("Parsing FetchResult (%d bytes, %s) for %s…", fetchResult.size(), fetchResult.getMimeType(), originalSone));
+		logger.finest(() -> format("Parsing FetchResult (%d bytes, %s) for %s…", fetchResult.size(), fetchResult.getMimeType(), originalSone));
 		Bucket soneBucket = fetchResult.asBucket();
-		InputStream soneInputStream = null;
-		try {
-			soneInputStream = soneBucket.getInputStream();
-			Sone parsedSone = soneParser.parseSone(originalSone,
-					soneInputStream);
+		try (InputStream soneInputStream = soneBucket.getInputStream()) {
+			Sone parsedSone = soneParser.parseSone(originalSone, soneInputStream);
 			if (parsedSone != null) {
-				logger.log(Level.FINER, "Sone %s was successfully parsed.", parsedSone);
+				logger.finer(() -> format("Sone %s was successfully parsed.", parsedSone));
 				parsedSone.setLatestEdition(requestUri.getEdition());
 			}
 			return parsedSone;
 		} catch (Exception e1) {
-			logger.log(Level.WARNING, String.format("Could not parse Sone from %s!", requestUri), e1);
+			logger.log(Level.WARNING, e1, () -> format("Could not parse Sone from %s!", requestUri));
 		} finally {
-			close(soneInputStream);
-			close(soneBucket);
+			soneBucket.free();
 		}
 		return null;
 	}