<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.pterodactylus</groupId>
- <artifactId>utils</artifactId>
- <version>0.6.1</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
</dependency>
</dependencies>
<repositories>
import java.util.Map;
import java.util.logging.Logger;
-import net.pterodactylus.util.logging.Logging;
-
/**
* An FCP connection to a Freenet node.
*
public class FcpConnection implements Closeable {
/** Logger. */
- private static final Logger logger = Logging.getLogger(FcpConnection.class.getName());
+ private static final Logger logger = Logger.getLogger(FcpConnection.class.getName());
/** The default port for FCP v2. */
public static final int DEFAULT_PORT = 9481;
import java.util.logging.Level;
import java.util.logging.Logger;
-import net.pterodactylus.util.logging.Logging;
-
/**
* Handles an FCP connection to a node.
*
class FcpConnectionHandler implements Runnable {
/** The logger. */
- private static final Logger logger = Logging.getLogger(FcpConnectionHandler.class.getName());
+ private static final Logger logger = Logger.getLogger(FcpConnectionHandler.class.getName());
/** The underlying connection. */
private final FcpConnection fcpConnection;
package net.pterodactylus.fcp;
-import net.pterodactylus.util.event.AbstractListenerManager;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Manages FCP listeners and event firing.
*
* @author David ‘Bombe’ Roden <bombe@pterodactylus.net>
*/
-public class FcpListenerManager extends AbstractListenerManager<FcpConnection, FcpListener> {
+public class FcpListenerManager {
+
+ private final FcpConnection source;
+ private final List<FcpListener> listeners = new CopyOnWriteArrayList<FcpListener>();
/**
* Creates a new listener manager.
* The source FCP connection
*/
public FcpListenerManager(FcpConnection fcpConnection) {
- super(fcpConnection);
+ this.source = fcpConnection;
+ }
+
+ public void addListener(FcpListener fcpListener) {
+ listeners.add(fcpListener);
+ }
+
+ public void removeListener(FcpListener fcpListener) {
+ listeners.remove(fcpListener);
+ }
+
+ private FcpConnection getSource() {
+ return source;
+ }
+
+ private List<FcpListener> getListeners() {
+ return listeners;
}
/**
package net.pterodactylus.fcp.highlevel;
+import static com.google.common.collect.FluentIterable.from;
+
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
import net.pterodactylus.fcp.AddPeer;
import net.pterodactylus.fcp.AllData;
import net.pterodactylus.fcp.SSKKeypair;
import net.pterodactylus.fcp.SimpleProgress;
import net.pterodactylus.fcp.WatchGlobal;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
-import net.pterodactylus.util.io.TemporaryInputStream;
-import net.pterodactylus.util.thread.ObjectWrapper;
+
+import com.google.common.base.Predicate;
/**
* High-level FCP client that hides the details of the underlying FCP
if (!allData.getIdentifier().equals(identifier)) {
return;
}
- InputStream temporaryInputStream;
- try {
- temporaryInputStream = new TemporaryInputStream(allData.getPayloadInputStream());
- getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(temporaryInputStream);
- } catch (IOException ioe1) {
- getResult.success(false).exception(ioe1);
- }
+ getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
completionLatch.countDown();
}
* if an FCP error occurs
*/
public PeerNote getPeerNote(final Peer peer) throws IOException, FcpException {
- final
ObjectWrapper<PeerNote> objectWrapper = new ObjectWrapper<PeerNote>();
+ final
AtomicReference<PeerNote> objectWrapper = new AtomicReference<PeerNote>();
new ExtendedFcpAdapter() {
/**
* if an FCP error occurs
*/
public SSKKeypair generateKeyPair() throws IOException, FcpException {
- final ObjectWrapper<SSKKeypair> sskKeypairWrapper = new ObjectWrapper<SSKKeypair>();
+ final AtomicReference<SSKKeypair> sskKeypairWrapper = new AtomicReference<SSKKeypair>();
new ExtendedFcpAdapter() {
/**
* if an FCP error occurs
*/
public Collection<Request> getGetRequests(final boolean global) throws IOException, FcpException {
- return Filters.filteredCollection(getRequests(global), new Filter<Request>() {
-
- /**
- * {@inheritDoc}
- */
+ return from(getRequests(global)).filter(new Predicate<Request>() {
@Override
- public boolean filterObject(Request request) {
+ public boolean apply(Request request) {
return request instanceof GetRequest;
}
- });
+ }).toList();
}
/**
* if an FCP error occurs
*/
public Collection<Request> getPutRequests(final boolean global) throws IOException, FcpException {
- return Filters.filteredCollection(getRequests(global), new Filter<Request>() {
-
- /**
- * {@inheritDoc}
- */
+ return from(getRequests(global)).filter(new Predicate<Request>() {
@Override
- public boolean filterObject(Request request) {
+ public boolean apply(Request request) {
return request instanceof PutRequest;
}
- });
+ }).toList();
}
/**
* if an I/O error occurs
*/
public NodeData getNodeInformation(final Boolean giveOpennetRef, final Boolean withPrivate, final Boolean withVolatile) throws IOException, FcpException {
- final ObjectWrapper<NodeData> nodeDataWrapper = new ObjectWrapper<NodeData>();
+ final AtomicReference<NodeData> nodeDataWrapper = new AtomicReference<NodeData>();
new ExtendedFcpAdapter() {
@Override
package net.pterodactylus.fcp.highlevel;
-import net.pterodactylus.util.event.AbstractListenerManager;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Manages {@link FcpClientListener}s and fires events.
*
* @author David ‘Bombe’ Roden <bombe@freenetproject.org>
*/
-public class FcpClientListenerManager extends AbstractListenerManager<FcpClient, FcpClientListener> {
+public class FcpClientListenerManager {
+
+ private final FcpClient source;
+ private final List<FcpClientListener> listeners = new CopyOnWriteArrayList<FcpClientListener>();
/**
* Creates a new FCP client listener manager.
* The source FCP client
*/
public FcpClientListenerManager(FcpClient fcpClient) {
- super(fcpClient);
+ this.source = fcpClient;
+ }
+
+ private FcpClient getSource() {
+ return source;
+ }
+
+ public List<FcpClientListener> getListeners() {
+ return listeners;
}
/**
}
}
+ public void addListener(FcpClientListener fcpClientListener) {
+ listeners.add(fcpClientListener);
+ }
+
+ public void removeListener(FcpClientListener fcpClientListener) {
+ listeners.remove(fcpClientListener);
+ }
+
}
projects / jFCPlib.git / commitdiff