X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=65bc227fa381d6a1b44004234d6de19e2c2e808a;hb=369d751e2d866f4263c2ef9652068b11ea515c7f;hp=d090d645ae9fb3ef94f27835ce5e03243d9fdf59;hpb=30ce501106648904c6079bba147103750d801ce4;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
index d090d64..65bc227 100644
--- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -1,9 +1,9 @@
 /*
- * jFCPlib - FcpClient.java - Copyright © 2009 David Roden
+ * jFCPlib - FcpClient.java - Copyright © 2009–2016 David Roden
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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,
@@ -12,12 +12,13 @@
  * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 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;
@@ -32,6 +33,7 @@ import java.util.Map;
 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;
@@ -68,10 +70,8 @@ import net.pterodactylus.fcp.RemovePeer;
 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
@@ -301,13 +301,14 @@ public class FcpClient implements Closeable {
 			@SuppressWarnings("synthetic-access")
 			public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
 				FcpClient.this.nodeHello = nodeHello;
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
 
 	/**
-	 * Returns the file with the given URI.
+	 * Returns the file with the given URI. The retrieved data will be run
+	 * through Freenet’s content filter.
 	 *
 	 * @param uri
 	 *            The URI to get
@@ -318,6 +319,24 @@ public class FcpClient implements Closeable {
 	 *             if an FCP error occurs
 	 */
 	public GetResult getURI(final String uri) throws IOException, FcpException {
+		return getURI(uri, true);
+	}
+
+	/**
+	 * Returns the file with the given URI.
+	 *
+	 * @param uri
+	 *            The URI to get
+	 * @param filterData
+	 *            {@code true} to filter the retrieved data, {@code false}
+	 *            otherwise
+	 * @return The result of the get request
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public GetResult getURI(final String uri, final boolean filterData) throws IOException, FcpException {
 		checkConnected(true);
 		final GetResult getResult = new GetResult();
 		new ExtendedFcpAdapter() {
@@ -329,6 +348,7 @@ public class FcpClient implements Closeable {
 			@SuppressWarnings("synthetic-access")
 			public void run() throws IOException {
 				ClientGet clientGet = new ClientGet(uri, identifier);
+				clientGet.setFilterData(filterData);
 				fcpConnection.sendMessage(clientGet);
 			}
 
@@ -342,14 +362,16 @@ public class FcpClient implements Closeable {
 					String newUri = getFailed.getRedirectURI();
 					getResult.realUri(newUri);
 					try {
-						fcpConnection.sendMessage(new ClientGet(newUri, identifier));
+						ClientGet clientGet = new ClientGet(newUri, identifier);
+						clientGet.setFilterData(filterData);
+						fcpConnection.sendMessage(clientGet);
 					} catch (IOException ioe1) {
 						getResult.success(false).exception(ioe1);
-						completionLatch.countDown();
+						complete();
 					}
 				} else {
 					getResult.success(false).errorCode(getFailed.getCode());
-					completionLatch.countDown();
+					complete();
 				}
 			}
 
@@ -358,14 +380,8 @@ public class FcpClient implements Closeable {
 				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);
-				}
-				completionLatch.countDown();
+				getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
+				complete();
 			}
 
 		}.execute();
@@ -457,7 +473,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
 				if (endListPeers.getIdentifier().equals(identifier)) {
-					completionLatch.countDown();
+					complete();
 				}
 			}
 		}.execute();
@@ -580,8 +596,8 @@ public class FcpClient implements Closeable {
 
 	/**
 	 * Adds a peer, reading the noderef of the peer from the given file.
-	 * <strong>Note:</strong> the file to read the noderef from has to reside on
-	 * the same machine as the node!
+	 * <strong>Note:</strong> the file to read the noderef from has to reside
+	 * on the same machine as the node!
 	 *
 	 * @param file
 	 *            The name of the file containing the peer’s noderef
@@ -624,7 +640,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -667,7 +683,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -699,7 +715,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -720,7 +736,7 @@ public class FcpClient implements Closeable {
 	 *             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() {
 
 			/**
@@ -747,7 +763,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return objectWrapper.get();
@@ -786,7 +802,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer receivedPeer) {
 				if (receivedPeer.getIdentity().equals(peer.getIdentity())) {
-					completionLatch.countDown();
+					complete();
 				}
 			}
 		}.execute();
@@ -806,7 +822,7 @@ public class FcpClient implements Closeable {
 	 *             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() {
 
 			/**
@@ -824,7 +840,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedSSKKeypair(FcpConnection fcpConnection, SSKKeypair sskKeypair) {
 				sskKeypairWrapper.set(sskKeypair);
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return sskKeypairWrapper.get();
@@ -848,16 +864,12 @@ public class FcpClient implements Closeable {
 	 *             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();
 	}
 
 	/**
@@ -874,16 +886,12 @@ public class FcpClient implements Closeable {
 	 *             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();
 	}
 
 	/**
@@ -891,8 +899,8 @@ public class FcpClient implements Closeable {
 	 *
 	 * @param global
 	 *            <code>true</code> to return requests from the global queue,
-	 *            <code>false</code> to only show requests from the client-local
-	 *            queue
+	 *            <code>false</code> to only show requests from the
+	 *            client-local queue
 	 * @return All requests
 	 * @throws IOException
 	 *             if an I/O error occurs
@@ -997,7 +1005,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return requests.values();
@@ -1070,7 +1078,7 @@ public class FcpClient implements Closeable {
 					return;
 				}
 				pluginReplies.putAll(fcpPluginReply.getReplies());
-				completionLatch.countDown();
+				complete();
 			}
 
 		}.execute();
@@ -1097,7 +1105,7 @@ public class FcpClient implements Closeable {
 	 *             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
@@ -1113,7 +1121,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedNodeData(FcpConnection fcpConnection, NodeData nodeData) {
 				nodeDataWrapper.set(nodeData);
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return nodeDataWrapper.get();
@@ -1165,7 +1173,7 @@ public class FcpClient implements Closeable {
 	private abstract class ExtendedFcpAdapter extends FcpAdapter {
 
 		/** The count down latch used to wait for completion. */
-		protected final CountDownLatch completionLatch = new CountDownLatch(1);
+		private final CountDownLatch completionLatch = new CountDownLatch(1);
 
 		/** The FCP exception, if any. */
 		protected FcpException fcpException;
@@ -1221,6 +1229,13 @@ public class FcpClient implements Closeable {
 		public abstract void run() throws IOException;
 
 		/**
+		 * Signals completion of the command processing.
+		 */
+		protected void complete() {
+			completionLatch.countDown();
+		}
+
+		/**
 		 * {@inheritDoc}
 		 */
 		@Override