You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/14 11:52:51 UTC
svn commit: r1568235 [4/6] - in /qpid/trunk/qpid/java:
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/jmx/src/test/java/org/apache/qpid/server/store/ber...
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java Fri Feb 14 10:52:47 2014
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.qpid.AMQStoreException;
+import org.apache.qpid.server.store.AMQStoreException;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.transport.Xid;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java Fri Feb 14 10:52:47 2014
@@ -27,10 +27,8 @@ import org.apache.qpid.server.store.Tran
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.queue.BaseQueue;
-import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.Transaction;
@@ -110,11 +108,9 @@ public class LocalTransaction implements
beginTranIfNecessary();
_transaction.dequeueMessage(queue, message);
-
}
- catch(AMQException e)
+ catch(RuntimeException e)
{
- _logger.error("Error during message dequeues", e);
tidyUpOnError(e);
}
}
@@ -143,17 +139,16 @@ public class LocalTransaction implements
beginTranIfNecessary();
_transaction.dequeueMessage(queue, message);
}
-
}
+
}
- catch(AMQException e)
+ catch(RuntimeException e)
{
- _logger.error("Error during message dequeues", e);
tidyUpOnError(e);
}
}
- private void tidyUpOnError(Exception e)
+ private void tidyUpOnError(RuntimeException e)
{
try
{
@@ -168,32 +163,20 @@ public class LocalTransaction implements
_transaction.abortTran();
}
}
- catch (Exception abortException)
- {
- _logger.error("Abort transaction failed while trying to handle previous error", abortException);
- }
finally
{
- resetDetails();
+ resetDetails();
}
}
- throw new RuntimeException(e);
+ throw e;
}
-
private void beginTranIfNecessary()
{
if(_transaction == null)
{
- try
- {
- _transaction = _transactionLog.newTransaction();
- }
- catch (Exception e)
- {
- tidyUpOnError(e);
- }
+ _transaction = _transactionLog.newTransaction();
}
}
@@ -215,10 +198,8 @@ public class LocalTransaction implements
beginTranIfNecessary();
_transaction.enqueueMessage(queue, message);
}
- catch (Exception e)
+ catch(RuntimeException e)
{
- _logger.error("Error during message enqueue", e);
-
tidyUpOnError(e);
}
}
@@ -245,14 +226,12 @@ public class LocalTransaction implements
beginTranIfNecessary();
_transaction.enqueueMessage(queue, message);
+
}
}
-
}
- catch (Exception e)
+ catch(RuntimeException e)
{
- _logger.error("Error during message enqueue", e);
-
tidyUpOnError(e);
}
}
@@ -281,12 +260,10 @@ public class LocalTransaction implements
doPostTransactionActions();
}
- catch (Exception e)
+ catch(RuntimeException e)
{
- _logger.error("Failed to commit transaction", e);
-
doRollbackActions();
- throw new RuntimeException("Failed to commit transaction", e);
+ throw e;
}
finally
{
@@ -348,14 +325,11 @@ public class LocalTransaction implements
{
doPostTransactionActions();
deferred.run();
-
}
- catch (Exception e)
+ catch (RuntimeException e)
{
- _logger.error("Failed to commit transaction", e);
-
doRollbackActions();
- throw new RuntimeException("Failed to commit transaction", e);
+ throw e;
}
finally
{
@@ -371,7 +345,6 @@ public class LocalTransaction implements
try
{
doPostTransactionActions();
-
deferred.run();
}
finally
@@ -382,9 +355,8 @@ public class LocalTransaction implements
return future;
}
- catch (Exception e)
+ catch (RuntimeException e)
{
- _logger.error("Failed to commit transaction", e);
try
{
doRollbackActions();
@@ -393,8 +365,9 @@ public class LocalTransaction implements
{
resetDetails();
}
- throw new RuntimeException("Failed to commit transaction", e);
+ throw e;
}
+
}
private void doPostTransactionActions()
@@ -425,11 +398,6 @@ public class LocalTransaction implements
_transaction.abortTran();
}
}
- catch (AMQException e)
- {
- _logger.error("Failed to rollback transaction", e);
- throw new RuntimeException("Failed to rollback transaction", e);
- }
finally
{
try
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java Fri Feb 14 10:52:47 2014
@@ -20,32 +20,29 @@
*/
package org.apache.qpid.server.util;
+import org.apache.log4j.Logger;
+
public class ConnectionScopedRuntimeException extends RuntimeException
{
- public ConnectionScopedRuntimeException()
- {
- }
+ private static final Logger LOGGER = Logger.getLogger(ConnectionScopedRuntimeException.class);
+
public ConnectionScopedRuntimeException(final String message)
{
super(message);
+ LOGGER.error(message);
}
public ConnectionScopedRuntimeException(final String message, final Throwable cause)
{
super(message, cause);
+ LOGGER.error(message,cause);
}
public ConnectionScopedRuntimeException(final Throwable cause)
{
super(cause);
+ LOGGER.error("Exception occurred", cause);
}
- public ConnectionScopedRuntimeException(final String message,
- final Throwable cause,
- final boolean enableSuppression,
- final boolean writableStackTrace)
- {
- super(message, cause, enableSuppression, writableStackTrace);
- }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java Fri Feb 14 10:52:47 2014
@@ -48,7 +48,7 @@ public class MapJsonSerializer
}
catch (Exception e)
{
- throw new RuntimeException("Failure to serialize map:" + attributeMap, e);
+ throw new ConnectionScopedRuntimeException("Failure to serialize map:" + attributeMap, e);
}
return stringWriter.toString();
}
@@ -62,7 +62,7 @@ public class MapJsonSerializer
}
catch (Exception e)
{
- throw new RuntimeException("Failure to deserialize json:" + json, e);
+ throw new ConnectionScopedRuntimeException("Failure to deserialize json:" + json, e);
}
return attributesMap;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java Fri Feb 14 10:52:47 2014
@@ -20,32 +20,29 @@
*/
package org.apache.qpid.server.util;
+import org.apache.log4j.Logger;
+
public class ServerScopedRuntimeException extends RuntimeException
{
- public ServerScopedRuntimeException()
- {
- }
+ private static final Logger LOGGER = Logger.getLogger(ServerScopedRuntimeException.class);
public ServerScopedRuntimeException(final String message)
{
super(message);
+ LOGGER.error(message);
+
}
public ServerScopedRuntimeException(final String message, final Throwable cause)
{
super(message, cause);
+ LOGGER.error(message, cause);
}
public ServerScopedRuntimeException(final Throwable cause)
{
super(cause);
+ LOGGER.error("Exception occurred", cause);
}
- public ServerScopedRuntimeException(final String message,
- final Throwable cause,
- final boolean enableSuppression,
- final boolean writableStackTrace)
- {
- super(message, cause, enableSuppression, writableStackTrace);
- }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Feb 14 10:52:47 2014
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
import org.apache.qpid.server.security.QpidSecurityException;
import org.apache.qpid.server.configuration.ExchangeConfiguration;
import org.apache.qpid.server.configuration.QueueConfiguration;
@@ -70,7 +70,7 @@ import org.apache.qpid.server.store.Dura
import org.apache.qpid.server.store.Event;
import org.apache.qpid.server.store.EventListener;
import org.apache.qpid.server.txn.DtxRegistry;
-import org.apache.qpid.server.virtualhost.plugins.QueueExistsException;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
public abstract class AbstractVirtualHost implements VirtualHost, IConnectionRegistry.RegistryChangeListener, EventListener
{
@@ -125,7 +125,7 @@ public abstract class AbstractVirtualHos
StatisticsGatherer brokerStatisticsGatherer,
SecurityManager parentSecurityManager,
VirtualHostConfiguration hostConfig,
- org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception
+ org.apache.qpid.server.model.VirtualHost virtualHost)
{
if (hostConfig == null)
{
@@ -185,7 +185,7 @@ public abstract class AbstractVirtualHos
}
abstract protected void initialiseStorage(VirtualHostConfiguration hostConfig,
- org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception;
+ org.apache.qpid.server.model.VirtualHost virtualHost);
public IConnectionRegistry getConnectionRegistry()
{
@@ -293,17 +293,36 @@ public abstract class AbstractVirtualHos
protected void initialiseModel(VirtualHostConfiguration config)
- throws ConfigurationException, AMQException, QpidSecurityException
{
_logger.debug("Loading configuration for virtualhost: " + config.getName());
+
_exchangeRegistry.initialise(_exchangeFactory);
List<String> exchangeNames = config.getExchanges();
for (String exchangeName : exchangeNames)
{
- configureExchange(config.getExchangeConfiguration(exchangeName));
+ try
+ {
+ configureExchange(config.getExchangeConfiguration(exchangeName));
+ }
+ catch (QpidSecurityException e)
+ {
+ throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
+ }
+ catch (UnknownExchangeException e)
+ {
+ throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
+ }
+ catch (ReservedExchangeNameException e)
+ {
+ throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
+ }
+ catch (AMQUnknownExchangeType e)
+ {
+ throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
+ }
}
String[] queueNames = config.getQueueNames();
@@ -311,12 +330,24 @@ public abstract class AbstractVirtualHos
for (Object queueNameObj : queueNames)
{
String queueName = String.valueOf(queueNameObj);
- configureQueue(config.getQueueConfiguration(queueName));
+ try
+ {
+ configureQueue(config.getQueueConfiguration(queueName));
+ }
+ catch (ConfigurationException e)
+ {
+ throw new ServerScopedRuntimeException("Could not configure queue " + queueName, e);
+ }
+ catch (QpidSecurityException e)
+ {
+ throw new ServerScopedRuntimeException("Could not configure queue " + queueName, e);
+ }
}
}
private void configureExchange(ExchangeConfiguration exchangeConfiguration)
- throws AMQException, QpidSecurityException
+ throws QpidSecurityException, UnknownExchangeException, ReservedExchangeNameException,
+ AMQUnknownExchangeType
{
boolean durable = exchangeConfiguration.getDurable();
boolean autodelete = exchangeConfiguration.getAutoDelete();
@@ -333,7 +364,7 @@ public abstract class AbstractVirtualHos
}
private void configureQueue(QueueConfiguration queueConfiguration)
- throws AMQException, ConfigurationException, QpidSecurityException
+ throws ConfigurationException, QpidSecurityException
{
AMQQueue queue = _queueFactory.createAMQQueueImpl(queueConfiguration);
String queueName = queue.getName();
@@ -384,7 +415,7 @@ public abstract class AbstractVirtualHos
}
private void configureBinding(AMQQueue queue, Exchange exchange, String routingKey, Map<String,Object> arguments)
- throws AMQException, QpidSecurityException
+ throws QpidSecurityException
{
if (_logger.isInfoEnabled())
{
@@ -491,7 +522,7 @@ public abstract class AbstractVirtualHos
}
@Override
- public int removeQueue(AMQQueue queue) throws AMQException, QpidSecurityException
+ public int removeQueue(AMQQueue queue) throws QpidSecurityException
{
synchronized (getQueueRegistry())
{
@@ -515,7 +546,7 @@ public abstract class AbstractVirtualHos
boolean autoDelete,
boolean exclusive,
boolean deleteOnNoConsumer,
- Map<String, Object> arguments) throws AMQException, QpidSecurityException
+ Map<String, Object> arguments) throws QpidSecurityException, QueueExistsException
{
if (queueName == null)
@@ -607,7 +638,8 @@ public abstract class AbstractVirtualHos
boolean durable,
boolean autoDelete,
String alternateExchangeName)
- throws AMQException, QpidSecurityException
+ throws QpidSecurityException, ExchangeExistsException, ReservedExchangeNameException,
+ UnknownExchangeException, AMQUnknownExchangeType
{
synchronized (_exchangeRegistry)
{
@@ -653,7 +685,8 @@ public abstract class AbstractVirtualHos
}
@Override
- public void removeExchange(Exchange exchange, boolean force) throws AMQException, QpidSecurityException
+ public void removeExchange(Exchange exchange, boolean force)
+ throws QpidSecurityException, ExchangeIsAlternateException, RequiredExchangeException
{
if(exchange.hasReferrers())
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java Fri Feb 14 10:52:47 2014
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeRegistry;
@@ -120,10 +119,6 @@ public class BindingRecoverer extends Ab
}
return _exchange.getBinding(_bindingName, _queue, _bindingArgumentsMap);
}
- catch (AMQException e)
- {
- throw new RuntimeException(e);
- }
catch (QpidSecurityException e)
{
throw new ServerScopedRuntimeException("Security Exception thrown when recovering. The recovery " +
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java Fri Feb 14 10:52:47 2014
@@ -19,10 +19,9 @@ package org.apache.qpid.server.virtualho
*
*/
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.exchange.Exchange;
-public class ExchangeExistsException extends AMQException
+public class ExchangeExistsException extends Exception
{
private final Exchange _existing;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java Fri Feb 14 10:52:47 2014
@@ -1,4 +1,4 @@
-package org.apache.qpid.server.virtualhost;/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +18,9 @@ package org.apache.qpid.server.virtualho
* under the License.
*
*/
+package org.apache.qpid.server.virtualhost;
-import org.apache.qpid.AMQException;
-
-public class ExchangeIsAlternateException extends AMQException
+public class ExchangeIsAlternateException extends Exception
{
public ExchangeIsAlternateException(String name)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java Fri Feb 14 10:52:47 2014
@@ -22,7 +22,7 @@ package org.apache.qpid.server.virtualho
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
@@ -82,17 +82,22 @@ public class ExchangeRecoverer extends A
_exchange = _exchangeFactory.restoreExchange(id, exchangeName, exchangeType, autoDelete);
_exchangeRegistry.registerExchange(_exchange);
}
- }
+ }/*
catch (AMQException e)
{
throw new RuntimeException("Error recovering exchange uuid " + id + " name " + exchangeName, e);
- }
+ }*/
catch (QpidSecurityException e)
{
throw new ServerScopedRuntimeException("Security Exception thrown when recovering. The recovery " +
"thread should not be bound by permissions, this is likely " +
"a programming error.",e);
}
+ catch (AMQUnknownExchangeType e)
+ {
+ throw new ServerScopedRuntimeException("Unknown exchange type found when attempting to restore " +
+ "exchanges, check classpath", e);
+ }
}
@Override
Copied: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java (from r1568014, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java?p2=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java&p1=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java&r1=1568014&r2=1568235&rev=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/plugins/QueueExistsException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java Fri Feb 14 10:52:47 2014
@@ -18,12 +18,11 @@
* under the License.
*
*/
-package org.apache.qpid.server.virtualhost.plugins;
+package org.apache.qpid.server.virtualhost;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.queue.AMQQueue;
-public class QueueExistsException extends AMQException
+public class QueueExistsException extends Exception
{
private final AMQQueue _existing;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java Fri Feb 14 10:52:47 2014
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.model.Queue;
@@ -127,10 +126,6 @@ public class QueueRecoverer extends Abst
false, queueArgumentsMap);
}
}
- catch (AMQException e)
- {
- throw new RuntimeException("Error recovering queue uuid " + _id + " name " + queueName, e);
- }
catch (QpidSecurityException e)
{
throw new ServerScopedRuntimeException("Security Exception thrown when recovering. The recovery " +
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/RequiredExchangeException.java Fri Feb 14 10:52:47 2014
@@ -1,4 +1,4 @@
-package org.apache.qpid.server.virtualhost;/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +18,9 @@ package org.apache.qpid.server.virtualho
* under the License.
*
*/
+package org.apache.qpid.server.virtualhost;
-import org.apache.qpid.AMQException;
-
-public class RequiredExchangeException extends AMQException
+public class RequiredExchangeException extends Exception
{
public RequiredExchangeException(String name)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ReservedExchangeNameException.java Fri Feb 14 10:52:47 2014
@@ -19,9 +19,7 @@ package org.apache.qpid.server.virtualho
*
*/
-import org.apache.qpid.AMQException;
-
-public class ReservedExchangeNameException extends AMQException
+public class ReservedExchangeNameException extends Exception
{
private final String _name;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java Fri Feb 14 10:52:47 2014
@@ -29,6 +29,7 @@ import org.apache.qpid.server.store.Dura
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreCreator;
import org.apache.qpid.server.store.OperationalLoggingListener;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class StandardVirtualHost extends AbstractVirtualHost
{
@@ -39,29 +40,47 @@ public class StandardVirtualHost extends
StandardVirtualHost(VirtualHostRegistry virtualHostRegistry,
StatisticsGatherer brokerStatisticsGatherer,
org.apache.qpid.server.security.SecurityManager parentSecurityManager,
- VirtualHostConfiguration hostConfig, VirtualHost virtualHost) throws Exception
+ VirtualHostConfiguration hostConfig, VirtualHost virtualHost)
{
super(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig, virtualHost);
}
- private MessageStore initialiseMessageStore(VirtualHostConfiguration hostConfig, VirtualHost virtualHost) throws Exception
+ private MessageStore initialiseMessageStore(VirtualHostConfiguration hostConfig, VirtualHost virtualHost)
{
final Object storeTypeAttr = virtualHost.getAttribute(VirtualHost.STORE_TYPE);
String storeType = storeTypeAttr == null ? null : String.valueOf(storeTypeAttr);
MessageStore messageStore = null;
if (storeType == null)
{
- final Class<?> clazz = Class.forName(hostConfig.getMessageStoreClass());
- final Object o = clazz.newInstance();
+ try
+ {
+ final Class<?> clazz = Class.forName(hostConfig.getMessageStoreClass());
+ final Object o = clazz.newInstance();
+
+ if (!(o instanceof MessageStore))
+ {
+ throw new ClassCastException(clazz + " does not implement " + MessageStore.class);
+ }
- if (!(o instanceof MessageStore))
+ messageStore = (MessageStore) o;
+ }
+ catch (ClassNotFoundException e)
{
- throw new ClassCastException(clazz + " does not implement " + MessageStore.class);
+ throw new ServerScopedRuntimeException("Failed to fina virtual host message store implementation, " +
+ "check the classpath and the configuration", e);
+ }
+ catch (InstantiationException e)
+ {
+ throw new ServerScopedRuntimeException("Failed to initialise virtual host store, " +
+ "check the configuration", e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new ServerScopedRuntimeException("Failed to initialise virtual host store, " +
+ "check the configuration", e);
}
-
- messageStore = (MessageStore) o;
}
else
{
@@ -76,7 +95,7 @@ public class StandardVirtualHost extends
return messageStore;
}
- private DurableConfigurationStore initialiseConfigurationStore(VirtualHost virtualHost) throws Exception
+ private DurableConfigurationStore initialiseConfigurationStore(VirtualHost virtualHost)
{
DurableConfigurationStore configurationStore;
final Object storeTypeAttr = virtualHost.getAttribute(VirtualHost.CONFIG_STORE_TYPE);
@@ -99,7 +118,7 @@ public class StandardVirtualHost extends
}
- protected void initialiseStorage(VirtualHostConfiguration hostConfig, VirtualHost virtualHost) throws Exception
+ protected void initialiseStorage(VirtualHostConfiguration hostConfig, VirtualHost virtualHost)
{
_messageStore = initialiseMessageStore(hostConfig, virtualHost);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java Fri Feb 14 10:52:47 2014
@@ -46,7 +46,7 @@ public class StandardVirtualHostFactory
StatisticsGatherer brokerStatisticsGatherer,
org.apache.qpid.server.security.SecurityManager parentSecurityManager,
VirtualHostConfiguration hostConfig,
- org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception
+ org.apache.qpid.server.model.VirtualHost virtualHost)
{
return new StandardVirtualHost(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig, virtualHost);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/UnknownExchangeException.java Fri Feb 14 10:52:47 2014
@@ -1,4 +1,4 @@
-package org.apache.qpid.server.virtualhost;/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +18,9 @@ package org.apache.qpid.server.virtualho
* under the License.
*
*/
+package org.apache.qpid.server.virtualhost;
-import org.apache.qpid.AMQException;
-
-public class UnknownExchangeException extends AMQException
+public class UnknownExchangeException extends Exception
{
private final String _exchangeName;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Fri Feb 14 10:52:47 2014
@@ -24,7 +24,8 @@ import java.util.Collection;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ScheduledFuture;
-import org.apache.qpid.AMQException;
+
+import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.connection.IConnectionRegistry;
@@ -56,7 +57,7 @@ public interface VirtualHost extends Dur
Collection<AMQQueue> getQueues();
- int removeQueue(AMQQueue queue) throws AMQException, QpidSecurityException;
+ int removeQueue(AMQQueue queue) throws QpidSecurityException;
AMQQueue createQueue(UUID id,
String queueName,
@@ -65,7 +66,7 @@ public interface VirtualHost extends Dur
boolean autoDelete,
boolean exclusive,
boolean deleteOnNoConsumer,
- Map<String, Object> arguments) throws AMQException, QpidSecurityException;
+ Map<String, Object> arguments) throws QueueExistsException, QpidSecurityException;
Exchange createExchange(UUID id,
@@ -74,9 +75,11 @@ public interface VirtualHost extends Dur
boolean durable,
boolean autoDelete,
String alternateExchange)
- throws AMQException, QpidSecurityException;
+ throws QpidSecurityException, ExchangeExistsException, ReservedExchangeNameException,
+ UnknownExchangeException, AMQUnknownExchangeType;
- void removeExchange(Exchange exchange, boolean force) throws AMQException, QpidSecurityException;
+ void removeExchange(Exchange exchange, boolean force) throws QpidSecurityException, ExchangeIsAlternateException,
+ RequiredExchangeException;
MessageDestination getMessageDestination(String name);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Fri Feb 14 10:52:47 2014
@@ -26,8 +26,7 @@ import java.util.TreeMap;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQStoreException;
+import org.apache.qpid.server.store.AMQStoreException;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -47,6 +46,7 @@ import org.apache.qpid.server.store.Tran
import org.apache.qpid.server.txn.DtxBranch;
import org.apache.qpid.server.txn.DtxRegistry;
import org.apache.qpid.server.txn.ServerTransaction;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.transport.Xid;
import org.apache.qpid.transport.util.Functions;
@@ -138,18 +138,8 @@ public class VirtualHostConfigRecoveryHa
public void postCommit()
{
- try
- {
-
- queue.enqueue(message, null);
- ref.release();
- }
- catch (AMQException e)
- {
- _logger.error("Unable to enqueue message " + message.getMessageNumber() + " into " +
- "queue " + queue.getName() + " (from XA transaction)", e);
- throw new RuntimeException(e);
- }
+ queue.enqueue(message, null);
+ ref.release();
}
public void onRollback()
@@ -237,7 +227,7 @@ public class VirtualHostConfigRecoveryHa
{
_logger.error("Unexpected database exception when attempting to prepare a recovered XA transaction " +
xidAsString(id), e);
- throw new RuntimeException(e);
+ throw new ServerScopedRuntimeException(e);
}
}
@@ -269,74 +259,66 @@ public class VirtualHostConfigRecoveryHa
public void queueEntry(final UUID queueId, long messageId)
{
AMQQueue queue = _virtualHost.getQueue(queueId);
- try
+ if(queue != null)
{
- if(queue != null)
- {
- String queueName = queue.getName();
- ServerMessage message = _recoveredMessages.get(messageId);
- _unusedMessages.remove(messageId);
+ String queueName = queue.getName();
+ ServerMessage message = _recoveredMessages.get(messageId);
+ _unusedMessages.remove(messageId);
- if(message != null)
- {
-
-
- if (_logger.isDebugEnabled())
- {
- _logger.debug("On recovery, delivering " + message.getMessageNumber() + " to " + queueName);
- }
-
- Integer count = _queueRecoveries.get(queueName);
- if (count == null)
- {
- count = 0;
- }
+ if(message != null)
+ {
- queue.enqueue(message,null);
- _queueRecoveries.put(queueName, ++count);
+ if (_logger.isDebugEnabled())
+ {
+ _logger.debug("On recovery, delivering " + message.getMessageNumber() + " to " + queueName);
}
- else
+
+ Integer count = _queueRecoveries.get(queueName);
+ if (count == null)
{
- _logger.warn("Message id " + messageId + " referenced in log as enqueued in queue " + queueName + " is unknown, entry will be discarded");
- Transaction txn = _store.newTransaction();
- txn.dequeueMessage(queue, new DummyMessage(messageId));
- txn.commitTranAsync();
+ count = 0;
}
+
+ queue.enqueue(message,null);
+
+ _queueRecoveries.put(queueName, ++count);
}
else
{
- _logger.warn("Message id " + messageId + " in log references queue with id " + queueId + " which is not in the configuration, entry will be discarded");
+ _logger.warn("Message id " + messageId + " referenced in log as enqueued in queue " + queueName + " is unknown, entry will be discarded");
Transaction txn = _store.newTransaction();
- TransactionLogResource mockQueue =
- new TransactionLogResource()
- {
- @Override
- public String getName()
- {
- return "<<UNKNOWN>>";
- }
-
- @Override
- public UUID getId()
- {
- return queueId;
- }
-
- @Override
- public boolean isDurable()
- {
- return false;
- }
- };
- txn.dequeueMessage(mockQueue, new DummyMessage(messageId));
+ txn.dequeueMessage(queue, new DummyMessage(messageId));
txn.commitTranAsync();
}
-
}
- catch(AMQException e)
+ else
{
- throw new RuntimeException(e);
+ _logger.warn("Message id " + messageId + " in log references queue with id " + queueId + " which is not in the configuration, entry will be discarded");
+ Transaction txn = _store.newTransaction();
+ TransactionLogResource mockQueue =
+ new TransactionLogResource()
+ {
+ @Override
+ public String getName()
+ {
+ return "<<UNKNOWN>>";
+ }
+
+ @Override
+ public UUID getId()
+ {
+ return queueId;
+ }
+
+ @Override
+ public boolean isDurable()
+ {
+ return false;
+ }
+ };
+ txn.dequeueMessage(mockQueue, new DummyMessage(messageId));
+ txn.commitTranAsync();
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java Fri Feb 14 10:52:47 2014
@@ -42,6 +42,7 @@ import org.apache.qpid.server.logging.ac
import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class TaskExecutorTest extends TestCase
{
@@ -90,7 +91,7 @@ public class TaskExecutorTest extends Te
{
try
{
- Future<?> f = _executor.submit(new NeverEndingCallable(waitForCallLatch));
+ Future<Void> f = _executor.submit(new NeverEndingCallable(waitForCallLatch));
submitLatch.countDown();
f.get();
}
@@ -100,7 +101,14 @@ public class TaskExecutorTest extends Te
{
e = (Exception) e.getCause();
}
- submitExceptions.add(e);
+ if(e instanceof RuntimeException && e.getCause() instanceof Exception)
+ {
+ submitExceptions.add((Exception)e.getCause());
+ }
+ else
+ {
+ submitExceptions.add(e);
+ }
}
}
};
@@ -133,10 +141,10 @@ public class TaskExecutorTest extends Te
public void testSubmitAndWait() throws Exception
{
_executor.start();
- Object result = _executor.submitAndWait(new Callable<String>()
+ Object result = _executor.submitAndWait(new TaskExecutor.Task<Object>()
{
@Override
- public String call() throws Exception
+ public String call()
{
return "DONE";
}
@@ -186,11 +194,11 @@ public class TaskExecutorTest extends Te
_executor.start();
try
{
- _executor.submitAndWait(new Callable<Void>()
+ _executor.submitAndWait(new TaskExecutor.Task<Object>()
{
@Override
- public Void call() throws Exception
+ public Void call()
{
throw exception;
}
@@ -203,29 +211,6 @@ public class TaskExecutorTest extends Te
}
}
- public void testSubmitAndWaitPassesOriginalCheckedException()
- {
- final Exception exception = new Exception();
- _executor.start();
- try
- {
- _executor.submitAndWait(new Callable<Void>()
- {
-
- @Override
- public Void call() throws Exception
- {
- throw exception;
- }
- });
- fail("Exception is expected");
- }
- catch (Exception e)
- {
- assertEquals("Unexpected exception", exception, e.getCause());
- }
- }
-
public void testSubmitAndWaitCurrentActorAndSecurityManagerSubjectAreRespected() throws Exception
{
_executor.start();
@@ -238,10 +223,10 @@ public class TaskExecutorTest extends Te
{
CurrentActor.set(actor);
SecurityManager.setThreadSubject(subject);
- _executor.submitAndWait(new Callable<Void>()
+ _executor.submitAndWait(new TaskExecutor.Task<Object>()
{
@Override
- public Void call() throws Exception
+ public Void call()
{
taskLogActor.set(CurrentActor.get());
taskSubject.set(SecurityManager.getThreadSubject());
@@ -258,16 +243,16 @@ public class TaskExecutorTest extends Te
assertEquals("Unexpected security manager subject", subject, taskSubject.get());
}
- private class SubjectRetriever implements Callable<Subject>
+ private class SubjectRetriever implements TaskExecutor.Task<Subject>
{
@Override
- public Subject call() throws Exception
+ public Subject call()
{
return Subject.getSubject(AccessController.getContext());
}
}
- private class NeverEndingCallable implements Callable<Void>
+ private class NeverEndingCallable implements TaskExecutor.Task<Void>
{
private CountDownLatch _waitLatch;
@@ -278,7 +263,7 @@ public class TaskExecutorTest extends Te
}
@Override
- public Void call() throws Exception
+ public Void call()
{
if (_waitLatch != null)
{
@@ -288,7 +273,14 @@ public class TaskExecutorTest extends Te
// wait forever
synchronized (this)
{
- this.wait();
+ try
+ {
+ this.wait();
+ }
+ catch (InterruptedException e)
+ {
+ throw new ServerScopedRuntimeException(e);
+ }
}
return null;
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java Fri Feb 14 10:52:47 2014
@@ -21,7 +21,6 @@
package org.apache.qpid.server.consumer;
-import org.apache.qpid.AMQException;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.Filterable;
@@ -243,7 +242,7 @@ public class MockConsumer implements Con
}
@Override
- public void close() throws AMQException
+ public void close()
{
}
@@ -255,7 +254,7 @@ public class MockConsumer implements Con
@Override
public void checkTransactionStatus(long openWarn, long openClose,
- long idleWarn, long idleClose) throws AMQException
+ long idleWarn, long idleClose)
{
}
@@ -340,7 +339,7 @@ public class MockConsumer implements Con
}
@Override
- public void close(AMQConstant cause, String message) throws AMQException
+ public void close(AMQConstant cause, String message)
{
}
}
@@ -394,13 +393,12 @@ public class MockConsumer implements Con
@Override
public void close(AMQConstant cause, String message)
- throws AMQException
{
}
@Override
public void closeSession(AMQSessionModel session, AMQConstant cause,
- String message) throws AMQException
+ String message)
{
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java Fri Feb 14 10:52:47 2014
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.List;
import java.util.UUID;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -179,7 +178,7 @@ public class DefaultExchangeFactoryTest
@Override
public Exchange newInstance(UUID id, VirtualHost host, String name, boolean durable,
- boolean autoDelete) throws AMQException
+ boolean autoDelete)
{
return null;
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Fri Feb 14 10:52:47 2014
@@ -33,8 +33,6 @@ import java.util.Set;
import java.util.UUID;
import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInternalException;
import org.apache.qpid.server.security.QpidSecurityException;
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.server.logging.LogActor;
@@ -54,7 +52,7 @@ public class FanoutExchangeTest extends
private FanoutExchange _exchange;
private VirtualHost _virtualHost;
- public void setUp() throws AMQException
+ public void setUp()
{
CurrentActor.setDefault(mock(LogActor.class));
@@ -85,28 +83,28 @@ public class FanoutExchangeTest extends
assertFalse("calling isBound(AMQQueue) with null queue should return false", _exchange.isBound((AMQQueue) null));
}
- public void testIsBoundStringMapAMQQueue() throws QpidSecurityException, AMQInternalException
+ public void testIsBoundStringMapAMQQueue() throws QpidSecurityException
{
AMQQueue queue = bindQueue();
assertTrue("Should return true for a bound queue",
_exchange.isBound("matters", null, queue));
}
- public void testIsBoundStringAMQQueue() throws QpidSecurityException, AMQInternalException
+ public void testIsBoundStringAMQQueue() throws QpidSecurityException
{
AMQQueue queue = bindQueue();
assertTrue("Should return true for a bound queue",
_exchange.isBound("matters", queue));
}
- public void testIsBoundAMQQueue() throws QpidSecurityException, AMQInternalException
+ public void testIsBoundAMQQueue() throws QpidSecurityException
{
AMQQueue queue = bindQueue();
assertTrue("Should return true for a bound queue",
_exchange.isBound(queue));
}
- private AMQQueue bindQueue() throws QpidSecurityException, AMQInternalException
+ private AMQQueue bindQueue() throws QpidSecurityException
{
AMQQueue queue = mockQueue();
_exchange.addBinding("matters", queue, null);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Fri Feb 14 10:52:47 2014
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import junit.framework.TestCase;
-import org.apache.qpid.AMQInternalException;
import org.apache.qpid.server.security.QpidSecurityException;
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.server.logging.LogActor;
@@ -119,7 +118,7 @@ public class HeadersExchangeTest extends
}
private void bind(String bindingKey, Map<String, Object> arguments, AMQQueue q)
- throws QpidSecurityException, AMQInternalException
+ throws QpidSecurityException
{
_exchange.addBinding(bindingKey,q,arguments);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Fri Feb 14 10:52:47 2014
@@ -23,9 +23,7 @@ package org.apache.qpid.server.exchange;
import java.util.List;
import junit.framework.Assert;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -311,7 +309,7 @@ public class TopicExchangeTest extends Q
}
- private int routeMessage(String routingKey, long messageNumber) throws AMQException
+ private int routeMessage(String routingKey, long messageNumber)
{
ServerMessage message = mock(ServerMessage.class);
when(message.getRoutingKey()).thenReturn(routingKey);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java Fri Feb 14 10:52:47 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.logging.actors;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
@@ -79,7 +78,7 @@ public class AMQPConnectionActorTest ext
logs.get(0).toString().contains("/ch:"));
}
- public void testConnectionLoggingOff() throws Exception, AMQException
+ public void testConnectionLoggingOff() throws Exception
{
setStatusUpdatesEnabled(false);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java Fri Feb 14 10:52:47 2014
@@ -22,7 +22,6 @@ package org.apache.qpid.server.logging.a
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.NullRootMessageLogger;
@@ -66,10 +65,9 @@ public class CurrentActorTest extends Ba
* And then finally validates that removing the Connection actor results
* in there being no actors set.
*
- * @throws AMQException
* @throws org.apache.commons.configuration.ConfigurationException
*/
- public void testLIFO() throws AMQException, ConfigurationException
+ public void testLIFO() throws ConfigurationException
{
assertTrue("Unexpected actor: " + CurrentActor.get(), CurrentActor.get() instanceof TestLogActor);
AMQPConnectionActor connectionActor = new AMQPConnectionActor(getConnection(),
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Fri Feb 14 10:52:47 2014
@@ -36,8 +36,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-
-import org.apache.qpid.AMQException;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.QueueConfiguration;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Fri Feb 14 10:52:47 2014
@@ -20,20 +20,17 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.configuration.QueueConfiguration;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.message.InstanceProperties;
-import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.security.AuthorizationHolder;
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.consumer.ConsumerTarget;
-import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -213,7 +210,7 @@ public class MockAMQQueue implements AMQ
}
@Override
- public boolean resend(final QueueEntry entry, final Consumer consumer) throws AMQException
+ public boolean resend(final QueueEntry entry, final Consumer consumer)
{
return false;
}
@@ -225,7 +222,7 @@ public class MockAMQQueue implements AMQ
}
@Override
- public void enqueue(final ServerMessage message, final Action action) throws AMQException
+ public void enqueue(final ServerMessage message, final Action action)
{
}
@@ -241,7 +238,7 @@ public class MockAMQQueue implements AMQ
final FilterManager filters,
final Class messageClass,
final String consumerName,
- final EnumSet options) throws AMQException
+ final EnumSet options)
{
return new QueueConsumer(filters, messageClass, options.contains(Consumer.Option.ACQUIRES),
options.contains(Consumer.Option.SEES_REQUEUES), consumerName,
@@ -332,7 +329,7 @@ public class MockAMQQueue implements AMQ
return _deleted;
}
- public int delete() throws AMQException
+ public int delete()
{
_deleted = true;
return getMessageCount();
@@ -347,11 +344,6 @@ public class MockAMQQueue implements AMQ
{
}
- public boolean resend(QueueEntry entry, QueueConsumer consumer) throws AMQException
- {
- return false;
- }
-
@Override
public void removeQueueDeleteTask(final Action task)
{
@@ -451,7 +443,7 @@ public class MockAMQQueue implements AMQ
}
- public void checkMessageStatus() throws AMQException
+ public void checkMessageStatus()
{
}
@@ -461,7 +453,7 @@ public class MockAMQQueue implements AMQ
return null;
}
- public void flushConsumer(Consumer sub) throws AMQException
+ public void flushConsumer(Consumer sub)
{
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java Fri Feb 14 10:52:47 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.filter.Filterable;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java Fri Feb 14 10:52:47 2014
@@ -23,9 +23,6 @@ package org.apache.qpid.server.queue;
import java.util.Collections;
import junit.framework.AssertionFailedError;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
@@ -36,7 +33,6 @@ import java.util.EnumSet;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.consumer.Consumer;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class PriorityQueueTest extends SimpleAMQQueueTestBase
@@ -102,7 +98,7 @@ public class PriorityQueueTest extends S
}
- protected ServerMessage createMessage(Long id, byte i) throws AMQException
+ protected ServerMessage createMessage(Long id, byte i)
{
ServerMessage msg = super.createMessage(id);
@@ -111,7 +107,7 @@ public class PriorityQueueTest extends S
return msg;
}
- protected ServerMessage createMessage(Long id) throws AMQException
+ protected ServerMessage createMessage(Long id)
{
return createMessage(id, (byte) 0);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Fri Feb 14 10:52:47 2014
@@ -20,7 +20,6 @@ package org.apache.qpid.server.queue;
import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.RootMessageLogger;
@@ -48,7 +47,7 @@ public abstract class QueueEntryImplTest
protected QueueEntryImpl _queueEntry2;
protected QueueEntryImpl _queueEntry3;
- public abstract QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException;
+ public abstract QueueEntryImpl getQueueEntryImpl(int msgId);
public abstract void testCompareTo();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java Fri Feb 14 10:52:47 2014
@@ -21,7 +21,6 @@ package org.apache.qpid.server.queue;
import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -39,7 +38,7 @@ public abstract class QueueEntryListTest
public abstract L getTestList(boolean newList);
public abstract long getExpectedFirstMsgId();
public abstract int getExpectedListLength();
- public abstract ServerMessage getTestMessageToAdd() throws AMQException;
+ public abstract ServerMessage getTestMessageToAdd();
public void testGetQueue()
{
@@ -52,9 +51,8 @@ public abstract class QueueEntryListTest
* Test to add a message with properties specific to the queue type.
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getTestMessageToAdd()
- * @throws AMQException
*/
- public void testAddSpecificMessage() throws AMQException
+ public void testAddSpecificMessage()
{
final L list = getTestList();
list.add(getTestMessageToAdd());
@@ -73,9 +71,8 @@ public abstract class QueueEntryListTest
* Test to add a generic mock message.
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
- * @throws AMQException
*/
- public void testAddGenericMessage() throws AMQException
+ public void testAddGenericMessage()
{
final L list = getTestList();
final ServerMessage message = createServerMessage(666l);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java Fri Feb 14 10:52:47 2014
@@ -34,8 +34,7 @@ import java.util.EnumSet;
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.security.QpidSecurityException;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.exchange.DirectExchange;
@@ -129,7 +128,7 @@ abstract class SimpleAMQQueueTestBase<E
assertEquals("Virtual host was wrong", _virtualHost, _queue.getVirtualHost());
}
- public void testBinding() throws QpidSecurityException, AMQInternalException
+ public void testBinding() throws QpidSecurityException
{
_exchange.addBinding(_routingKey, _queue, Collections.EMPTY_MAP);
@@ -456,7 +455,7 @@ abstract class SimpleAMQQueueTestBase<E
Consumer.Option.SEES_REQUEUES));
}
- catch (AMQException e)
+ catch (MessageSource.ExistingExclusiveConsumer e)
{
ex = e;
}
@@ -476,7 +475,7 @@ abstract class SimpleAMQQueueTestBase<E
EnumSet.of(Consumer.Option.EXCLUSIVE));
}
- catch (AMQException e)
+ catch (MessageSource.ExistingConsumerPreventsExclusive e)
{
ex = e;
}
@@ -929,23 +928,11 @@ abstract class SimpleAMQQueueTestBase<E
{
// Create message
ServerMessage message = null;
- try
- {
- message = createMessage((long)i);
- }
- catch (AMQException e)
- {
- fail("Failure to create a test message:" + e.getMessage());
- }
+ message = createMessage((long)i);
+
// Put message on queue
- try
- {
- queue.enqueue(message,null);
- }
- catch (AMQException e)
- {
- fail("Failure to put message on queue:" + e.getMessage());
- }
+ queue.enqueue(message,null);
+
}
try
{
@@ -1024,7 +1011,7 @@ abstract class SimpleAMQQueueTestBase<E
}
- protected ServerMessage createMessage(Long id) throws AMQException
+ protected ServerMessage createMessage(Long id)
{
AMQMessageHeader header = mock(AMQMessageHeader.class);
when(header.getMessageId()).thenReturn(String.valueOf(id));
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java Fri Feb 14 10:52:47 2014
@@ -20,10 +20,6 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -51,7 +47,7 @@ public class SimpleQueueEntryImplTest ex
}
- public QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException
+ public QueueEntryImpl getQueueEntryImpl(int msgId)
{
ServerMessage message = mock(ServerMessage.class);
when(message.getMessageNumber()).thenReturn((long)msgId);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java Fri Feb 14 10:52:47 2014
@@ -20,7 +20,6 @@
package org.apache.qpid.server.queue;
import java.util.Collections;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -140,7 +139,7 @@ public class SortedQueueEntryListTest ex
return 67L;
}
- public ServerMessage getTestMessageToAdd() throws AMQException
+ public ServerMessage getTestMessageToAdd()
{
return generateTestMessage(1, "test value");
}
@@ -151,7 +150,7 @@ public class SortedQueueEntryListTest ex
return _testQueue;
}
- private ServerMessage generateTestMessage(final long id, final String keyValue) throws AMQException
+ private ServerMessage generateTestMessage(final long id, final String keyValue)
{
final ServerMessage message = mock(ServerMessage.class);
AMQMessageHeader hdr = mock(AMQMessageHeader.class);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java Fri Feb 14 10:52:47 2014
@@ -22,7 +22,6 @@ package org.apache.qpid.server.queue;
import java.util.Collections;
import java.util.UUID;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -56,7 +55,7 @@ public class SortedQueueEntryTest extend
super.setUp();
}
- public QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException
+ public QueueEntryImpl getQueueEntryImpl(int msgId)
{
final ServerMessage message = mock(ServerMessage.class);
AMQMessageHeader hdr = mock(AMQMessageHeader.class);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java Fri Feb 14 10:52:47 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -112,7 +111,7 @@ public class StandardQueueEntryListTest
}
@Override
- public ServerMessage getTestMessageToAdd() throws AMQException
+ public ServerMessage getTestMessageToAdd()
{
ServerMessage msg = mock(ServerMessage.class);
when(msg.getMessageNumber()).thenReturn(1l);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java Fri Feb 14 10:52:47 2014
@@ -20,8 +20,6 @@
*/
package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.consumer.MockConsumer;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Fri Feb 14 10:52:47 2014
@@ -36,7 +36,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.AMQStoreException;
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.exchange.Exchange;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java?rev=1568235&r1=1568234&r2=1568235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java Fri Feb 14 10:52:47 2014
@@ -25,10 +25,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.AMQStoreException;
+
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.InOrder;
@@ -82,7 +83,7 @@ public class JsonFileConfigStoreTest ext
_store.configureConfigStore(_virtualHost, _recoveryHandler);
fail("Store should not successfully configure if there is no path set");
}
- catch (AMQStoreException e)
+ catch (ServerScopedRuntimeException e)
{
// pass
}
@@ -97,7 +98,7 @@ public class JsonFileConfigStoreTest ext
_store.configureConfigStore(_virtualHost, _recoveryHandler);
fail("Store should not successfully configure if there is an invalid path set");
}
- catch (AMQStoreException e)
+ catch (ServerScopedRuntimeException e)
{
// pass
}
@@ -250,7 +251,7 @@ public class JsonFileConfigStoreTest ext
secondStore.configureConfigStore(_virtualHost, _recoveryHandler);
fail("Should not be able to open a second store with the same path");
}
- catch(AMQStoreException e)
+ catch(ServerScopedRuntimeException e)
{
// pass
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org