/*
- * 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
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;
+import static java.util.logging.Logger.getLogger;
import java.io.InputStream;
import java.util.HashSet;
import net.pterodactylus.sone.core.FreenetInterface.Fetched;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.SoneStatus;
-import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.service.AbstractService;
import freenet.client.FetchResult;
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;
public class SoneDownloaderImpl extends AbstractService implements SoneDownloader {
/** The logger. */
- private static final Logger logger = Logging.getLogger(SoneDownloaderImpl.class);
+ private static final Logger logger = getLogger(SoneDownloaderImpl.class.getName());
/** The maximum protocol version. */
private static final int MAX_PROTOCOL_VERSION = 0;
@Override
@SuppressWarnings("synthetic-access")
public void onFoundEdition(long edition, USK key,
- ObjectContainer objectContainer,
ClientContext clientContext, boolean metadata,
short codec, byte[] data, boolean newKnownGood,
boolean newSlotToo) {
} catch (Exception e1) {
logger.log(Level.WARNING, String.format("Could not parse Sone from %s!", requestUri), e1);
} finally {
- Closer.close(soneInputStream);
- soneBucket.free();
+ close(soneInputStream);
+ close(soneBucket);
}
return null;
}