X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=1ed2024c7a3e328c2458da101430bff986a157e0;hb=b55dc075f9cd34fb32baa44bbbc54a89d05e80b9;hp=838e4b0efadcda96d7281e78e11d29f5c6df0dda;hpb=35deb522de06ba7d97160445683375cf87529e8d;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 838e4b0..1ed2024 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -1,5 +1,5 @@
/*
- * Sone - FreenetInterface.java - Copyright © 2010â2016 David Roden
+ * Sone - FreenetInterface.java - Copyright © 2010â2019 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
@@ -78,8 +78,6 @@ import freenet.support.io.ResumeFailedException;
/**
* Contains all necessary functionality for interacting with the Freenet node.
- *
- * @author David âBombeâ Roden
*/
@Singleton
public class FreenetInterface {
@@ -95,9 +93,10 @@ public class FreenetInterface {
/** The high-level client to use for requests. */
private final HighLevelSimpleClient client;
+ private final RequestClient requestClient = new RequestClientBuilder().realTime().build();
/** The USK callbacks. */
- private final Map soneUskCallbacks = new HashMap();
+ private final Map soneUskCallbacks = new HashMap<>();
/** The not-Sone-related USK callbacks. */
private final Map uriUskCallbacks = Collections.synchronizedMap(new HashMap());
@@ -258,7 +257,7 @@ public class FreenetInterface {
try {
soneUskCallbacks.put(routingKey(requestUri), uskCallback);
node.clientCore.uskManager.subscribe(create(requestUri),
- uskCallback, true, (RequestClient) client);
+ uskCallback, true, requestClient);
} catch (MalformedURLException mue1) {
logger.log(WARNING, format("Could not subscribe USK â%sâ!",
requestUri), mue1);
@@ -271,8 +270,7 @@ public class FreenetInterface {
soneUskCallbacks.put(routingKey(requestUri), uskCallback);
node.clientCore
.uskManager
- .subscribe(create(requestUri), uskCallback, false,
- (RequestClient) client);
+ .subscribe(create(requestUri), uskCallback, false, requestClient);
} catch (MalformedURLException mue1) {
logger.log(WARNING,
format("Could not subscribe USK â%sâ!", requestUri),
@@ -328,7 +326,7 @@ public class FreenetInterface {
};
try {
- node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, (RequestClient) client);
+ node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
uriUskCallbacks.put(uri, uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.WARNING, String.format("Could not subscribe to USK: %s", uri), mue1);
@@ -356,8 +354,6 @@ public class FreenetInterface {
/**
* Callback for USK watcher events.
- *
- * @author David âBombeâ Roden
*/
public static interface Callback {
@@ -385,7 +381,6 @@ public class FreenetInterface {
* @see ImageInsertStartedEvent
* @see ImageInsertFailedEvent
* @see ImageInsertFinishedEvent
- * @author David âBombeâ Roden
*/
public class InsertToken implements ClientPutCallback {