X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderImpl.java;h=f3d5068d7bbb61cd7d598e3071e52af1257982b3;hp=df5d0c1be222392c13fd482f84f968267c13ea95;hb=2493e844ddeece59211c6a3c40e7ecc5d2cdb8b5;hpb=cb0161bb413434c393ae09d46001dba66b876875

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
index df5d0c1..f3d5068 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 - SoneDownloader.java - Copyright © 2010–2013 David Roden
+ * Sone - SoneDownloaderImpl.java - Copyright © 2010–2016 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
@@ -29,6 +29,8 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.pterodactylus.sone.core.FreenetInterface.Fetched;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
@@ -41,10 +43,6 @@ import freenet.keys.FreenetURI;
 import freenet.keys.USK;
 import freenet.node.RequestStarter;
 import freenet.support.api.Bucket;
-import freenet.support.io.Closer;
-import com.db4o.ObjectContainer;
-
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * The Sone downloader is responsible for download Sones as they are updated.
@@ -76,21 +74,9 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	 * 		The core
 	 * @param freenetInterface
 	 * 		The Freenet interface
-	 */
-	public SoneDownloaderImpl(Core core, FreenetInterface freenetInterface) {
-		this(core, freenetInterface, new SoneParser(core));
-	}
-
-	/**
-	 * Creates a new Sone downloader.
-	 *
-	 * @param core
-	 * 		The core
-	 * @param freenetInterface
-	 * 		The Freenet interface
 	 * @param soneParser
 	 */
-	@VisibleForTesting
+	@Inject
 	SoneDownloaderImpl(Core core, FreenetInterface freenetInterface, SoneParser soneParser) {
 		super("Sone Downloader", false);
 		this.core = core;
@@ -126,7 +112,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 						sone, key, newKnownGood, newSlotToo));
 				if (edition > sone.getLatestEdition()) {
 					sone.setLatestEdition(edition);
-					new Thread(fetchSoneAction(sone),
+					new Thread(fetchSoneAsSskAction(sone),
 							"Sone Downloader").start();
 				}
 			}
@@ -154,22 +140,8 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 		return (currentTimeMillis() - sone.getTime()) < DAYS.toMillis(7);
 	}
 
-	private void fetchSone(Sone sone) {
-		fetchSone(sone, sone.getRequestUri().sskForUSK());
-	}
-
-	/**
-	 * Fetches the updated Sone. This method can be used to fetch a Sone from a
-	 * specific URI.
-	 *
-	 * @param sone
-	 * 		The Sone to fetch
-	 * @param soneUri
-	 * 		The URI to fetch the Sone from
-	 */
-	@Override
-	public void fetchSone(Sone sone, FreenetURI soneUri) {
-		fetchSone(sone, soneUri, false);
+	private void fetchSoneAsSsk(Sone sone) {
+		fetchSone(sone, sone.getRequestUri().sskForUSK(), false);
 	}
 
 	/**
@@ -244,21 +216,21 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	}
 
 	@Override
-	public Runnable fetchSoneWithUriAction(final Sone sone) {
+	public Runnable fetchSoneAsUskAction(final Sone sone) {
 		return new Runnable() {
 			@Override
 			public void run() {
-				fetchSone(sone, sone.getRequestUri());
+				fetchSone(sone, sone.getRequestUri(), false);
 			}
 		};
 	}
 
 	@Override
-	public Runnable fetchSoneAction(final Sone sone) {
+	public Runnable fetchSoneAsSskAction(final Sone sone) {
 		return new Runnable() {
 			@Override
 			public void run() {
-				fetchSone(sone);
+				fetchSoneAsSsk(sone);
 			}
 		};
 	}