diff options
Diffstat (limited to 'qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges')
2 files changed, 17 insertions, 23 deletions
diff --git a/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java index 5d2c0dd5b2..6e1ea25f26 100644 --- a/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java +++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java @@ -20,14 +20,8 @@ */ package org.apache.qpid.extras.exchanges.diagnostic; -import java.util.ArrayList; -import java.util.Map; - -import javax.management.JMException; -import javax.management.openmbean.OpenDataException; -import javax.management.openmbean.TabularData; - import org.apache.log4j.Logger; + import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; @@ -41,6 +35,12 @@ import org.apache.qpid.server.message.InboundMessage; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.virtualhost.VirtualHost; +import javax.management.JMException; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.TabularData; +import java.util.ArrayList; +import java.util.Map; + /** * This is a special diagnostic exchange type which doesn't actually do anything * with messages. When it receives a message, it writes information about the @@ -54,9 +54,6 @@ public class DiagnosticExchange extends AbstractExchange public static final AMQShortString DIAGNOSTIC_EXCHANGE_CLASS = new AMQShortString("x-diagnostic"); public static final AMQShortString DIAGNOSTIC_EXCHANGE_NAME = new AMQShortString("diagnostic"); - /** The logger */ - //private static final Logger _logger = Logger.getLogger(DiagnosticExchange.class); - /** * MBean class implementing the management interfaces. */ @@ -83,7 +80,6 @@ public class DiagnosticExchange extends AbstractExchange * @returns null * TODO or can there? Could this actually return all the information in one easy to read table? */ - @Override public TabularData bindings() throws OpenDataException { return null; @@ -197,13 +193,6 @@ public class DiagnosticExchange extends AbstractExchange public ArrayList<AMQQueue> doRoute(InboundMessage payload) { //TODO shouldn't modify messages... perhaps put a new message on the queue? - /* - Long value = new Long(SizeOf.getUsedMemory()); - AMQShortString key = new AMQShortString("memory"); - FieldTable headers = ((BasicContentHeaderProperties)payload.getMessageHeader().properties).getHeaders(); - headers.put(key, value); - ((BasicContentHeaderProperties)payload.getMessageHeader().properties).setHeaders(headers); - */ AMQQueue q = getQueueRegistry().getQueue(new AMQShortString("diagnosticqueue")); ArrayList<AMQQueue> queues = new ArrayList<AMQQueue>(); queues.add(q); diff --git a/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java index def0b3f91a..cf79924f3d 100644 --- a/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java +++ b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java @@ -21,11 +21,6 @@ package org.apache.qpid.extras.exchanges.example; */ -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.UUID; - import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; @@ -41,6 +36,11 @@ import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.virtualhost.VirtualHost; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; + public class TestExchange implements Exchange { @@ -80,6 +80,11 @@ public class TestExchange implements Exchange return false; } + public boolean isBound(String bindingKey, Map<String, Object> arguments, AMQQueue queue) + { + return false; + } + public boolean isBound(String bindingKey) { return false; |