From e800236056d84261ca34a849d8767405724de298 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 13 Feb 2014 16:24:28 +0000 Subject: QPID-5551 : Remove redundant throws AMQException clauses git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1567971 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/protocol/v0_10/ConsumerTarget_0_10.java | 2 +- .../protocol/v0_10/ServerSessionDelegate.java | 5 --- .../qpid/server/protocol/v0_8/AMQChannel.java | 48 ++++++++-------------- .../server/protocol/v0_8/AMQProtocolEngine.java | 1 - .../server/protocol/v0_8/ClientDeliveryMethod.java | 2 +- .../server/protocol/v0_8/ConsumerTarget_0_8.java | 9 ++-- .../v0_8/handler/BasicGetMethodHandler.java | 2 +- .../v0_8/handler/ExchangeDeleteHandler.java | 6 --- .../v0_8/output/ProtocolOutputConverter.java | 8 ++-- .../v0_8/output/ProtocolOutputConverterImpl.java | 10 +---- .../qpid/server/protocol/v0_8/AMQChannelTest.java | 2 +- .../protocol/v0_8/InternalTestProtocolSession.java | 8 ++-- .../server/protocol/v1_0/ConsumerTarget_1_0.java | 4 +- .../server/management/amqp/ManagementNode.java | 4 +- .../management/amqp/ManagementNodeConsumer.java | 10 +---- .../server/management/amqp/ManagementResponse.java | 4 +- 16 files changed, 40 insertions(+), 85 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java index 114095bace..c1ee0bc108 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java @@ -191,7 +191,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget implements FlowC private final AddMessageDispositionListenerAction _postIdSettingAction; - public void send(final MessageInstance entry, boolean batch) throws AMQException + public void send(final MessageInstance entry, boolean batch) { ServerMessage serverMsg = entry.getMessage(); diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index 9a90b74656..d3d53504be 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -29,7 +29,6 @@ import org.apache.qpid.AMQException; import org.apache.qpid.AMQStoreException; import org.apache.qpid.AMQUnknownExchangeType; import org.apache.qpid.server.exchange.Exchange; -import org.apache.qpid.server.exchange.ExchangeInUseException; import org.apache.qpid.server.exchange.HeadersExchange; import org.apache.qpid.server.filter.FilterManager; import org.apache.qpid.server.filter.FilterManagerFactory; @@ -887,10 +886,6 @@ public class ServerSessionDelegate extends SessionDelegate virtualHost.removeExchange(exchange, !method.getIfUnused()); } } - catch (ExchangeInUseException e) - { - exception(session, method, ExecutionErrorCode.PRECONDITION_FAILED, "Exchange in use"); - } catch (ExchangeIsAlternateException e) { exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Exchange in use as an alternate exchange"); diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 8becdf853b..5afb2069c1 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -1228,23 +1228,16 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F @Override public void postCommit() { - try - { - final - ProtocolOutputConverter outputConverter = + final ProtocolOutputConverter outputConverter = _session.getProtocolOutputConverter(); - outputConverter.writeReturn(message.getMessagePublishInfo(), - message.getContentHeaderBody(), - message, - _channelId, - AMQConstant.NO_CONSUMERS.getCode(), - IMMEDIATE_DELIVERY_REPLY_TEXT); - } - catch (AMQException e) - { - throw new RuntimeException(e); - } + outputConverter.writeReturn(message.getMessagePublishInfo(), + message.getContentHeaderBody(), + message, + _channelId, + AMQConstant.NO_CONSUMERS.getCode(), + IMMEDIATE_DELIVERY_REPLY_TEXT); + } @Override @@ -1354,23 +1347,14 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F public void postCommit() { - try - { - AMQMessage message = _reference.getMessage(); - _session.getProtocolOutputConverter().writeReturn(message.getMessagePublishInfo(), - message.getContentHeaderBody(), - message, - _channelId, - _errorCode.getCode(), - AMQShortString.validValueOf(_description)); - _reference.release(); - } - catch (AMQException e) - { - //TODO - throw new RuntimeException(e); - } - + AMQMessage message = _reference.getMessage(); + _session.getProtocolOutputConverter().writeReturn(message.getMessagePublishInfo(), + message.getContentHeaderBody(), + message, + _channelId, + _errorCode.getCode(), + AMQShortString.validValueOf(_description)); + _reference.release(); } public void onRollback() diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index e83e86981b..ba61afc376 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -1670,7 +1670,6 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi @Override public void deliverToClient(final Consumer sub, final ServerMessage message, final InstanceProperties props, final long deliveryTag) - throws AMQException { registerMessageDelivered(message.getSize()); _protocolOutputConverter.writeDeliver(message, diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java index 2e362c11f8..9f8799f68e 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java @@ -28,5 +28,5 @@ import org.apache.qpid.server.consumer.Consumer; public interface ClientDeliveryMethod { void deliverToClient(final Consumer sub, final ServerMessage message, final InstanceProperties props, - final long deliveryTag) throws AMQException; + final long deliveryTag); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java index 0f0e49bf7f..2ce8caefc9 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java @@ -114,7 +114,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen * @throws org.apache.qpid.AMQException */ @Override - public void send(MessageInstance entry, boolean batch) throws AMQException + public void send(MessageInstance entry, boolean batch) { // We don't decrement the reference here as we don't want to consume the message // but we do want to send it to the client. @@ -177,7 +177,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen * @throws org.apache.qpid.AMQException */ @Override - public void send(MessageInstance entry, boolean batch) throws AMQException + public void send(MessageInstance entry, boolean batch) { // if we do not need to wait for client acknowledgements // we can decrement the reference count immediately. @@ -293,7 +293,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen * @throws org.apache.qpid.AMQException */ @Override - public void send(MessageInstance entry, boolean batch) throws AMQException + public void send(MessageInstance entry, boolean batch) { @@ -505,7 +505,6 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen } protected void sendToClient(final ServerMessage message, final InstanceProperties props, final long deliveryTag) - throws AMQException { _deliveryMethod.deliverToClient(getConsumer(), message, props, deliveryTag); @@ -524,7 +523,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen converter.confirmConsumerAutoClose(getChannel().getChannelId(), getConsumerTag()); } - public void queueEmpty() throws AMQException + public void queueEmpty() { if (isAutoClose()) { diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java index b1d2fa5088..fd4324cee0 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java @@ -186,7 +186,7 @@ public class BasicGetMethodHandler implements StateAwareMethodListener