♻️ Hide count-down latch for completion signalling

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

diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
index bc1092e..65bc227 100644 (file)
--- 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,8 +12,7 @@
  * 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;
@@ -302,7 +301,7 @@ public class FcpClient implements Closeable {
                        @SuppressWarnings("synthetic-access")
                        public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
                                FcpClient.this.nodeHello = nodeHello;
-                               completionLatch.countDown();
+                               complete();
                        }
                }.execute();
        }
@@ -368,11 +367,11 @@ public class FcpClient implements Closeable {
                                                fcpConnection.sendMessage(clientGet);
                                        } catch (IOException ioe1) {
                                                getResult.success(false).exception(ioe1);
-                                               completionLatch.countDown();
+                                               complete();
                                        }
                                } else {
                                        getResult.success(false).errorCode(getFailed.getCode());
-                                       completionLatch.countDown();
+                                       complete();
                                }
                        }
 
@@ -382,7 +381,7 @@ public class FcpClient implements Closeable {
                                        return;
                                }
                                getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
-                               completionLatch.countDown();
+                               complete();
                        }
 
                }.execute();
@@ -474,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();
@@ -641,7 +640,7 @@ public class FcpClient implements Closeable {
                         */
                        @Override
                        public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-                               completionLatch.countDown();
+                               complete();
                        }
                }.execute();
        }
@@ -684,7 +683,7 @@ public class FcpClient implements Closeable {
                         */
                        @Override
                        public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-                               completionLatch.countDown();
+                               complete();
                        }
                }.execute();
        }
@@ -716,7 +715,7 @@ public class FcpClient implements Closeable {
                         */
                        @Override
                        public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
-                               completionLatch.countDown();
+                               complete();
                        }
                }.execute();
        }
@@ -764,7 +763,7 @@ public class FcpClient implements Closeable {
                         */
                        @Override
                        public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
-                               completionLatch.countDown();
+                               complete();
                        }
                }.execute();
                return objectWrapper.get();
@@ -803,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();
@@ -841,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();
@@ -1006,7 +1005,7 @@ public class FcpClient implements Closeable {
                         */
                        @Override
                        public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
-                               completionLatch.countDown();
+                               complete();
                        }
                }.execute();
                return requests.values();
@@ -1079,7 +1078,7 @@ public class FcpClient implements Closeable {
                                        return;
                                }
                                pluginReplies.putAll(fcpPluginReply.getReplies());
-                               completionLatch.countDown();
+                               complete();
                        }
 
                }.execute();
@@ -1122,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();
@@ -1174,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;
@@ -1230,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