End getPeerNote() on “EndListPeerNotes” message and only store the peer note we’re...

[jFCPlib.git] / src / net / pterodactylus / fcp / highlevel / FcpClient.java

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index 7694485..90ad4da 100644 (file)
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -30,16 +30,22 @@ import java.util.concurrent.CountDownLatch;
 import net.pterodactylus.fcp.AddPeer;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
+import net.pterodactylus.fcp.EndListPeerNotes;
 import net.pterodactylus.fcp.EndListPeers;
 import net.pterodactylus.fcp.FcpAdapter;
 import net.pterodactylus.fcp.FcpConnection;
 import net.pterodactylus.fcp.FcpListener;
+import net.pterodactylus.fcp.ListPeerNotes;
 import net.pterodactylus.fcp.ListPeers;
 import net.pterodactylus.fcp.ModifyPeer;
 import net.pterodactylus.fcp.NodeHello;
 import net.pterodactylus.fcp.NodeRef;
 import net.pterodactylus.fcp.Peer;
+import net.pterodactylus.fcp.PeerNote;
+import net.pterodactylus.fcp.PeerRemoved;
 import net.pterodactylus.fcp.ProtocolError;
+import net.pterodactylus.fcp.RemovePeer;
+import net.pterodactylus.util.thread.ObjectWrapper;
 
 /**
  * High-level FCP client that hides the details of the underlying FCP
@@ -140,7 +146,7 @@ public class FcpClient {
         *             if an FCP error occurs
         */
        public void connect() throws IOException, FcpException {
-               ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+               new ExtendedFcpAdapter() {
 
                        /**
                         * {@inheritDoc}
@@ -160,8 +166,7 @@ public class FcpClient {
                        public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
                                completionLatch.countDown();
                        }
-               };
-               fcpListener.execute();
+               }.execute();
        }
 
        /**
@@ -181,15 +186,19 @@ public class FcpClient {
        /**
         * Returns all peers that the node has.
         *
+        * @param withMetadata
+        *            <code>true</code> to include peer metadata
+        * @param withVolatile
+        *            <code>true</code> to include volatile peer data
         * @return A set containing the node’s peers
         * @throws IOException
         *             if an I/O error occurs
         * @throws FcpException
         *             if an FCP error occurs
         */
-       public Set<Peer> getPeers() throws IOException, FcpException {
+       public Set<Peer> getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
                final Set<Peer> peers = new HashSet<Peer>();
-               ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+               new ExtendedFcpAdapter() {
 
                        /**
                         * {@inheritDoc}
@@ -197,7 +206,7 @@ public class FcpClient {
                        @Override
                        @SuppressWarnings("synthetic-access")
                        public void run() throws IOException {
-                               fcpConnection.sendMessage(new ListPeers("list-peers"));
+                               fcpConnection.sendMessage(new ListPeers("list-peers", withMetadata, withVolatile));
                        }
 
                        /**
@@ -215,8 +224,7 @@ public class FcpClient {
                        public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
                                completionLatch.countDown();
                        }
-               };
-               fcpListener.execute();
+               }.execute();
                return peers;
        }
 
@@ -292,7 +300,7 @@ public class FcpClient {
         *             if an FCP error occurs
         */
        private void addPeer(final AddPeer addPeer) throws IOException, FcpException {
-               ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+               new ExtendedFcpAdapter() {
 
                        /**
                         * {@inheritDoc}
@@ -310,8 +318,7 @@ public class FcpClient {
                        public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
                                completionLatch.countDown();
                        }
-               };
-               fcpListener.execute();
+               }.execute();
        }
 
        /**
@@ -336,7 +343,7 @@ public class FcpClient {
         *             if an FCP error occurs
         */
        public void modifyPeer(final Peer peer, final Boolean allowLocalAddresses, final Boolean disabled, final Boolean listenOnly) throws IOException, FcpException {
-               ExtendedFcpAdapter fcpListener = new ExtendedFcpAdapter() {
+               new ExtendedFcpAdapter() {
 
                        /**
                         * {@inheritDoc}
@@ -354,8 +361,88 @@ public class FcpClient {
                        public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
                                completionLatch.countDown();
                        }
-               };
-               fcpListener.execute();
+               }.execute();
+       }
+
+       /**
+        * Removes the given peer.
+        *
+        * @param peer
+        *            The peer to remove
+        * @throws IOException
+        *             if an I/O error occurs
+        * @throws FcpException
+        *             if an FCP error occurs
+        */
+       public void removePeer(final Peer peer) throws IOException, FcpException {
+               new ExtendedFcpAdapter() {
+
+                       /**
+                        * {@inheritDoc}
+                        */
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void run() throws IOException {
+                               fcpConnection.sendMessage(new RemovePeer(peer.getIdentity()));
+                       }
+
+                       /**
+                        * {@inheritDoc}
+                        */
+                       @Override
+                       public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
+                               completionLatch.countDown();
+                       }
+               }.execute();
+       }
+
+       //
+       // PEER NOTES MANAGEMENT
+       //
+
+       /**
+        * Returns the peer note of the given peer.
+        *
+        * @param peer
+        *            The peer to get the note for
+        * @return The peer’s note
+        * @throws IOException
+        *             if an I/O error occurs
+        * @throws FcpException
+        *             if an FCP error occurs
+        */
+       public PeerNote getPeerNote(final Peer peer) throws IOException, FcpException {
+               final ObjectWrapper<PeerNote> objectWrapper = new ObjectWrapper<PeerNote>();
+               new ExtendedFcpAdapter() {
+
+                       /**
+                        * {@inheritDoc}
+                        */
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void run() throws IOException {
+                               fcpConnection.sendMessage(new ListPeerNotes(peer.getIdentity()));
+                       }
+
+                       /**
+                        * {@inheritDoc}
+                        */
+                       @Override
+                       public void receivedPeerNote(FcpConnection fcpConnection, PeerNote peerNote) {
+                               if (peerNote.getNodeIdentifier().equals(peer.getIdentity())) {
+                                       objectWrapper.set(peerNote);
+                               }
+                       }
+
+                       /**
+                        * {@inheritDoc}
+                        */
+                       @Override
+                       public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
+                               completionLatch.countDown();
+                       }
+               }.execute();
+               return objectWrapper.get();
        }
 
        /**