X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=6413dc2787d08dc8dfd36d8b9348883804e8f3ff;hb=a30d521e1add957b2ddfee455bc6e061efbf44b7;hp=7364aa8a01ce58c44b5114c38fb7f1673f9175e7;hpb=572802370f7dff98b690df85b79e256335e28b33;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 7364aa8..6413dc2 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
@@ -380,13 +380,7 @@ 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);
-				}
+				getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
 				completionLatch.countDown();
 			}
 
@@ -602,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
@@ -742,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() {
 
 			/**
@@ -828,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() {
 
 			/**
@@ -870,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();
 	}
 
 	/**
@@ -896,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();
 	}
 
 	/**
@@ -913,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
@@ -1119,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