From dca50466338d343fe4acb888554d8b11a8de0385 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 16 May 2008 16:39:42 +0000 Subject: [PATCH] throw exception if client is not connected git-svn-id: http://trooper/svn/projects/jFCPlib/branch/high-level-client@905 c3eda9e8-030b-0410-8277-bc7414b0a119 --- .../fcp/highlevel/HighLevelClient.java | 81 +++++++++++++++++----- .../fcp/highlevel/HighLevelException.java | 54 +++++++++++++++ 2 files changed, 117 insertions(+), 18 deletions(-) create mode 100644 src/net/pterodactylus/fcp/highlevel/HighLevelException.java diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java index 93378d3..e263454 100644 --- a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java +++ b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java @@ -177,7 +177,7 @@ public class HighLevelClient { * Notifies all listeners that a client has connected. */ private void fireClientConnected() { - for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) { + for (HighLevelClientListener highLevelClientListener : highLevelClientListeners) { highLevelClientListener.clientConnected(this); } } @@ -190,7 +190,7 @@ public class HighLevelClient { * if there was no exception */ private void fireClientDisconnected(Throwable throwable) { - for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) { + for (HighLevelClientListener highLevelClientListener : highLevelClientListeners) { highLevelClientListener.clientDisconnected(this, throwable); } } @@ -225,7 +225,7 @@ public class HighLevelClient { * The progress of the request */ private void fireProgressReceived(String identifier, HighLevelProgress highLevelProgress) { - for (HighLevelProgressListener highLevelProgressListener: highLevelProgressListeners) { + for (HighLevelProgressListener highLevelProgressListener : highLevelProgressListeners) { highLevelProgressListener.progressReceived(this, identifier, highLevelProgress); } } @@ -304,7 +304,9 @@ public class HighLevelClient { */ public HighLevelCallback connect(InetAddress address, int port) throws IOException { try { - fcpConnection = new FcpConnection(address, port); + synchronized (this) { + fcpConnection = new FcpConnection(address, port); + } fcpConnection.addFcpListener(highLevelClientFcpListener); fcpConnection.connect(); ClientHello clientHello = new ClientHello(clientName); @@ -330,8 +332,11 @@ public class HighLevelClient { * @return A callback with the keypair * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback generateKey() throws IOException { + public HighLevelCallback generateKey() throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("generateSSK"); GenerateSSK generateSSK = new GenerateSSK(identifier); HighLevelCallback keyGenerationCallback = new HighLevelCallback(new KeyGenerationResult(identifier)); @@ -349,8 +354,11 @@ public class HighLevelClient { * client-local queue * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public void setWatchGlobal(boolean enabled) throws IOException { + public void setWatchGlobal(boolean enabled) throws IOException, HighLevelException { + checkConnection(); WatchGlobal watchGlobal = new WatchGlobal(enabled); fcpConnection.sendMessage(watchGlobal); } @@ -361,8 +369,11 @@ public class HighLevelClient { * @return A callback with the peer list * @throws IOException * if an I/O error occurs with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback getPeers() throws IOException { + public HighLevelCallback getPeers() throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("listPeers"); ListPeers listPeers = new ListPeers(identifier, true, true); HighLevelCallback peerListCallback = new HighLevelCallback(new PeerListResult(identifier)); @@ -379,8 +390,11 @@ public class HighLevelClient { * @return A peer callback * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback addPeer(String nodeRefFile) throws IOException { + public HighLevelCallback addPeer(String nodeRefFile) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("addPeer"); AddPeer addPeer = new AddPeer(nodeRefFile); HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier)); @@ -397,8 +411,11 @@ public class HighLevelClient { * @return A peer callback * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback addPeer(URL nodeRefURL) throws IOException { + public HighLevelCallback addPeer(URL nodeRefURL) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("addPeer"); AddPeer addPeer = new AddPeer(nodeRefURL); HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier)); @@ -415,8 +432,11 @@ public class HighLevelClient { * @return A peer callback * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback addPeer(NodeRef nodeRef) throws IOException { + public HighLevelCallback addPeer(NodeRef nodeRef) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("addPeer"); AddPeer addPeer = new AddPeer(nodeRef); HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier)); @@ -438,8 +458,12 @@ public class HighLevelClient { * Whether you want to write to the given directory * @return A direct disk access callback * @throws IOException + * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException { + public HighLevelCallback checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException, HighLevelException { + checkConnection(); TestDDARequest testDDARequest = new TestDDARequest(directory, wantRead, wantWrite); HighLevelCallback directDiskAccessCallback = new HighLevelCallback(new DirectDiskAccessResult(directory)); directDiskAccessCallbacks.put(directory, directDiskAccessCallback); @@ -464,8 +488,11 @@ public class HighLevelClient { * @return A download result * @throws IOException * if an I/O error occurs communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelProgressCallback download(String uri, String filename, boolean global) throws IOException { + public HighLevelProgressCallback download(String uri, String filename, boolean global) throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("download"); ClientGet clientGet = new ClientGet(uri, identifier, (filename == null) ? ReturnType.direct : ReturnType.disk); clientGet.setGlobal(global); @@ -481,8 +508,11 @@ public class HighLevelClient { * @return The request list result * @throws IOException * if an I/O errors communicating with the node + * @throws HighLevelException + * if the client is not connected */ - public HighLevelCallback getRequests() throws IOException { + public HighLevelCallback getRequests() throws IOException, HighLevelException { + checkConnection(); String identifier = generateIdentifier("list-persistent-requests"); ListPersistentRequests listPersistentRequests = new ListPersistentRequests(); synchronized (syncObject) { @@ -500,6 +530,21 @@ public class HighLevelClient { // /** + * Checks whether the client is already connected and throws an exception if + * it is not. + * + * @throws HighLevelException + * if the client is not connected + */ + private void checkConnection() throws HighLevelException { + synchronized (this) { + if (fcpConnection == null) { + throw new HighLevelException("client is not connected"); + } + } + } + + /** * Generates an identifier for the given function. * * @param function @@ -571,31 +616,31 @@ public class HighLevelClient { } if (identifier == null) { /* key generation callbacks */ - for (Entry> keyGenerationEntry: keyGenerationCallbacks.entrySet()) { + for (Entry> keyGenerationEntry : keyGenerationCallbacks.entrySet()) { keyGenerationEntry.getValue().getIntermediaryResult().setFailed(true); keyGenerationEntry.getValue().setDone(); } keyGenerationCallbacks.clear(); /* peer list callbacks. */ - for (Entry> peerListEntry: peerListCallbacks.entrySet()) { + for (Entry> peerListEntry : peerListCallbacks.entrySet()) { peerListEntry.getValue().getIntermediaryResult().setFailed(true); peerListEntry.getValue().setDone(); } peerListCallbacks.clear(); /* peer callbacks. */ - for (Entry> peerEntry: peerCallbacks.entrySet()) { + for (Entry> peerEntry : peerCallbacks.entrySet()) { peerEntry.getValue().getIntermediaryResult().setFailed(true); peerEntry.getValue().setDone(); } peerCallbacks.clear(); /* direct disk access callbacks. */ - for (Entry> directDiskAccessEntry: directDiskAccessCallbacks.entrySet()) { + for (Entry> directDiskAccessEntry : directDiskAccessCallbacks.entrySet()) { directDiskAccessEntry.getValue().getIntermediaryResult().setFailed(true); directDiskAccessEntry.getValue().setDone(); } directDiskAccessCallbacks.clear(); /* download callbacks. */ - for (Entry> downloadEntry: downloadCallbacks.entrySet()) { + for (Entry> downloadEntry : downloadCallbacks.entrySet()) { downloadEntry.getValue().getIntermediaryResult().setFailed(true); downloadEntry.getValue().setDone(); } diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelException.java b/src/net/pterodactylus/fcp/highlevel/HighLevelException.java new file mode 100644 index 0000000..51637cc --- /dev/null +++ b/src/net/pterodactylus/fcp/highlevel/HighLevelException.java @@ -0,0 +1,54 @@ +/** + * + */ +package net.pterodactylus.fcp.highlevel; + +/** + * Base exception for high-level client exceptions. + * + * @author David Roden + * @version $Id$ + */ +public class HighLevelException extends Exception { + + /** + * Creates a new high-level client exception. + */ + public HighLevelException() { + super(); + } + + /** + * Creates a new high-level client exception with the given message. + * + * @param message + * The message of the exception + */ + public HighLevelException(String message) { + super(message); + } + + /** + * Creates a new high-level client exception with the given cause. + * + * @param cause + * The cause of the exception + */ + public HighLevelException(Throwable cause) { + super(cause); + } + + /** + * Creates a new high-level client exception with the given message and + * cause. + * + * @param message + * The message of the exception + * @param cause + * The cause of the exception + */ + public HighLevelException(String message, Throwable cause) { + super(message, cause); + } + +} -- 2.7.4