Author: rajith
Date: Fri Jun 15 17:20:29 2012
New Revision: 1350701
URL: http://svn.apache.org/viewvc?rev=1350701&view=rev
Log:
QPID-4027 Cleaned up the exception heirarchy and modified the interfaces
to throw the required exceptions.
TODO: Add Java doc to denote type of exceptions that could be thrown.
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/AddressException.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Connection.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionException.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ReceiverException.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SenderException.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Session.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SessionException.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReadOnlyMessageAdapter.java
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/AddressException.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/AddressException.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/AddressException.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/AddressException.java
Fri Jun 15 17:20:29 2012
@@ -20,7 +20,7 @@ package org.apache.qpid.messaging;
/**
* Base class for all address related exceptions thrown by the Messaging API.
*/
-public class AddressException extends MessagingException
+public class AddressException extends LinkException
{
public AddressException(String addr,String message, Throwable cause)
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Connection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Connection.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Connection.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Connection.java
Fri Jun 15 17:20:29 2012
@@ -26,17 +26,17 @@ public interface Connection
* Creates a network connection to the peer and negotiates with the peer
to establish a protocol level connection.
* When this method returns the connection is ready to be used.
*/
- public void open() throws ConnectionException;
+ public void open() throws MessagingException;
/**
* Returns true if the connection is open.
*/
- public boolean isOpen() throws ConnectionException;
+ public boolean isOpen() throws MessagingException;
/**
* Close the connection and any sessions associated with this connection.
*/
- public void close() throws ConnectionException;
+ public void close() throws MessagingException;
/**
* Creates a session with the given name.The name should be unique.
@@ -44,7 +44,7 @@ public interface Connection
* @param name Unique identifier for the session.
* @return Session
*/
- public Session createSession(String name)throws ConnectionException;
+ public Session createSession(String name)throws MessagingException;
/**
* Creates a transactional session with the given name.
@@ -53,7 +53,7 @@ public interface Connection
* @param name Unique identifier for the session.
* @return Session
*/
- public Session createTransactionalSession(String name)throws
ConnectionException;
+ public Session createTransactionalSession(String name)throws
MessagingException;
/**
* Returns the authenticated username for this connection.
@@ -62,5 +62,5 @@ public interface Connection
* For KERBEROS the username will be the kerberos username.
* @return The authenticated username.
*/
- public String getAuthenticatedUsername();
+ public String getAuthenticatedUsername()throws MessagingException;
}
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionException.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionException.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionException.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionException.java
Fri Jun 15 17:20:29 2012
@@ -22,6 +22,7 @@ package org.apache.qpid.messaging;
*/
public class ConnectionException extends MessagingException
{
+ // might be useful to provide the current connection state?
public ConnectionException(String message, Throwable cause)
{
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ReceiverException.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ReceiverException.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ReceiverException.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ReceiverException.java
Fri Jun 15 17:20:29 2012
@@ -20,7 +20,7 @@ package org.apache.qpid.messaging;
/**
* Base class for all Receiver related exceptions thrown by the Messaging API.
*/
-public class ReceiverException extends MessagingException
+public class ReceiverException extends LinkException
{
public ReceiverException(String message, Throwable cause)
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SenderException.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SenderException.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SenderException.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SenderException.java
Fri Jun 15 17:20:29 2012
@@ -20,7 +20,7 @@ package org.apache.qpid.messaging;
/**
* Base class for all Sender related exceptions thrown by the Messaging API.
*/
-public class SenderException extends MessagingException
+public class SenderException extends LinkException
{
public SenderException(String message, Throwable cause)
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Session.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Session.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Session.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/Session.java
Fri Jun 15 17:20:29 2012
@@ -25,7 +25,7 @@ public interface Session
/**
* Returns true if the session is closed.
*/
- public boolean isClosed() throws MessagingException;
+ public boolean isClosed();
/**
* Closes a session and all associated senders and receivers.
@@ -121,4 +121,12 @@ public interface Session
* @return
*/
public Connection getConnection() throws MessagingException;
+
+ public boolean hasError();
+
+ /**
+ * If the session has been rendered invalid by some exception,
+ * this method will result in that exception being thrown on calling this
method.
+ */
+ public void checkError() throws MessagingException;
}
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SessionException.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SessionException.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SessionException.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/SessionException.java
Fri Jun 15 17:20:29 2012
@@ -22,6 +22,7 @@ package org.apache.qpid.messaging;
*/
public class SessionException extends MessagingException
{
+ // might be useful to provide the current session state?
public SessionException(String message, Throwable cause)
{
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReadOnlyMessageAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReadOnlyMessageAdapter.java?rev=1350701&r1=1350700&r2=1350701&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReadOnlyMessageAdapter.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReadOnlyMessageAdapter.java
Fri Jun 15 17:20:29 2012
@@ -15,11 +15,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.messaging;
+package org.apache.qpid.messaging.util;
import java.util.Collections;
import java.util.Map;
+import org.apache.qpid.messaging.Message;
+import org.apache.qpid.messaging.MessageNotWritableException;
+import org.apache.qpid.messaging.MessagingException;
+
/**
* Ensures the message is read only by blocking the delegates
* setter methods.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
