Add test for DI constructability of SoneDownloader

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneDownloader.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 1a8f870..039faad 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -1,100 +1,26 @@
-/*
- * Sone - SoneDownloader.java - Copyright © 2010 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package net.pterodactylus.sone.core;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.service.AbstractService;
-import freenet.client.FetchResult;
+import net.pterodactylus.util.service.Service;
+
+import freenet.keys.FreenetURI;
+
+import com.google.inject.ImplementedBy;
 
 /**
- * The Sone downloader is responsible for download Sones as they are updated.
+ * Downloads and parses Sone and {@link Core#updateSone(Sone) updates the
+ * core}.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class SoneDownloader extends AbstractService {
-
-       /** The logger. */
-       private static final Logger logger = Logging.getLogger(SoneDownloader.class);
-
-       /** The Freenet interface. */
-       private final FreenetInterface freenetInterface;
-
-       /** The sones to update. */
-       private final Set<Sone> sones = new HashSet<Sone>();
-
-       /**
-        * Creates a new Sone downloader.
-        *
-        * @param freenetInterface
-        *            The Freenet interface
-        */
-       public SoneDownloader(FreenetInterface freenetInterface) {
-               super("Sone Downloader");
-               this.freenetInterface = freenetInterface;
-       }
-
-       //
-       // ACTIONS
-       //
-
-       /**
-        * Adds the given Sone to the set of Sones that will be watched for updates.
-        *
-        * @param sone
-        *            The Sone to add
-        */
-       public void addSone(Sone sone) {
-               if (sones.add(sone)) {
-                       freenetInterface.registerUsk(sone, this);
-               }
-       }
-
-       /**
-        * Fetches the updated Sone. This method is a callback method for
-        * {@link FreenetInterface#registerUsk(Sone, SoneDownloader)}.
-        *
-        * @param sone
-        *            The Sone to fetch
-        */
-       public void fetchSone(Sone sone) {
-               logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" }) });
-               FetchResult fetchResult = freenetInterface.fetchUri(sone.getRequestUri().setMetaString(new String[] { "sone.xml" }));
-               logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size());
-       }
+@ImplementedBy(SoneDownloaderImpl.class)
+public interface SoneDownloader extends Service {
 
-       //
-       // SERVICE METHODS
-       //
+       void addSone(Sone sone);
+       void fetchSone(Sone sone, FreenetURI soneUri);
+       Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly);
 
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected void serviceStop() {
-               for (Sone sone : sones) {
-                       freenetInterface.unregisterUsk(sone);
-               }
-       }
+       Runnable fetchSoneWithUriAction(Sone sone);
+       Runnable fetchSoneAction(Sone sone);
 
 }