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/25 02:19:45 UTC
svn commit: r1571510 [2/3] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/binding/
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/jav...
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java Tue Feb 25 01:19:43 2014
@@ -31,7 +31,6 @@ import org.apache.qpid.server.model.*;
final class BindingAdapter extends AbstractConfiguredObject<BindingAdapter> implements Binding<BindingAdapter>
{
private final org.apache.qpid.server.binding.Binding _binding;
- private Statistics _statistics = NoStatistics.getInstance();
private final ExchangeAdapter _exchange;
private QueueAdapter _queue;
@@ -107,11 +106,6 @@ final class BindingAdapter extends Abstr
return 0; //TODO
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
-
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
@@ -129,6 +123,12 @@ final class BindingAdapter extends Abstr
return new HashMap<String, Object> (_binding.getArguments());
}
+ @Override
+ public long getMatches()
+ {
+ return _binding.getMatches();
+ }
+
public void delete()
{
_binding.delete();
@@ -180,7 +180,7 @@ final class BindingAdapter extends Abstr
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Binding.class);
+ return getAttributeNames(Binding.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Tue Feb 25 01:19:43 2014
@@ -153,7 +153,6 @@ public class BrokerAdapter<X extends Bro
private final VirtualHostRegistry _virtualHostRegistry;
private final LogRecorder _logRecorder;
private final RootMessageLogger _rootMessageLogger;
- private StatisticsAdapter _statistics;
private final Map<String, VirtualHost<?>> _vhostAdapters = new HashMap<String, VirtualHost<?>>();
private final Map<UUID, Port<?>> _portAdapters = new HashMap<UUID, Port<?>>();
@@ -188,7 +187,6 @@ public class BrokerAdapter<X extends Bro
_virtualHostRegistry = virtualHostRegistry;
_logRecorder = logRecorder;
_rootMessageLogger = rootMessageLogger;
- _statistics = new StatisticsAdapter(statisticsGatherer);
_authenticationProviderFactory = authenticationProviderFactory;
_groupProviderFactory = groupProviderFactory;
_accessControlProviderFactory = accessControlProviderFactory;
@@ -552,11 +550,30 @@ public class BrokerAdapter<X extends Bro
throw new IllegalStateException();
}
- public Statistics getStatistics()
+
+ @Override
+ public long getBytesIn()
{
- return _statistics;
+ return _statisticsGatherer.getDataReceiptStatistics().getTotal();
}
+ @Override
+ public long getBytesOut()
+ {
+ return _statisticsGatherer.getDataDeliveryStatistics().getTotal();
+ }
+
+ @Override
+ public long getMessagesIn()
+ {
+ return _statisticsGatherer.getMessageReceiptStatistics().getTotal();
+ }
+
+ @Override
+ public long getMessagesOut()
+ {
+ return _statisticsGatherer.getMessageDeliveryStatistics().getTotal();
+ }
@SuppressWarnings("unchecked")
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
@@ -889,7 +906,7 @@ public class BrokerAdapter<X extends Bro
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Broker.class);
+ return getAttributeNames(Broker.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java Tue Feb 25 01:19:43 2014
@@ -44,13 +44,11 @@ final class ConnectionAdapter extends Ab
private final Map<AMQSessionModel, SessionAdapter> _sessionAdapters =
new HashMap<AMQSessionModel, SessionAdapter>();
- private final Statistics _statistics;
public ConnectionAdapter(final AMQConnectionModel conn, TaskExecutor taskExecutor)
{
super(UUIDGenerator.generateRandomUUID(), taskExecutor);
_connection = conn;
- _statistics = new ConnectionStatisticsAdapter(conn);
}
@Override
@@ -290,15 +288,11 @@ final class ConnectionAdapter extends Ab
@Override
public Collection<String> getAttributeNames()
{
- final HashSet<String> attrNames = new HashSet<String>(Attribute.getAttributeNames(Connection.class));
+ final HashSet<String> attrNames = new HashSet<String>(getAttributeNames(Connection.class));
return Collections.unmodifiableCollection(attrNames);
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
@@ -327,34 +321,6 @@ final class ConnectionAdapter extends Ab
}
- private class ConnectionStatisticsAdapter extends StatisticsAdapter
- {
- public ConnectionStatisticsAdapter(StatisticsGatherer applicationRegistry)
- {
- super(applicationRegistry);
- }
-
- @Override
- public Collection<String> getStatisticNames()
- {
- return Connection.AVAILABLE_STATISTICS;
- }
-
- @Override
- public Object getStatistic(String name)
- {
- if(LAST_IO_TIME.equals(name))
- {
- return _connection.getLastIoTime();
- }
- else if(SESSION_COUNT.equals(name))
- {
- return _connection.getSessionModels().size();
- }
- return super.getStatistic(name);
- }
- }
-
@Override
protected boolean setState(State currentState, State desiredState)
{
@@ -375,4 +341,40 @@ final class ConnectionAdapter extends Ab
{
throw new UnsupportedOperationException("Changing attributes on connection is not supported.");
}
+
+ @Override
+ public long getBytesIn()
+ {
+ return _connection.getDataReceiptStatistics().getTotal();
+ }
+
+ @Override
+ public long getBytesOut()
+ {
+ return _connection.getDataDeliveryStatistics().getTotal();
+ }
+
+ @Override
+ public long getMessagesIn()
+ {
+ return _connection.getMessageReceiptStatistics().getTotal();
+ }
+
+ @Override
+ public long getMessagesOut()
+ {
+ return _connection.getMessageDeliveryStatistics().getTotal();
+ }
+
+ @Override
+ public long getLastIoTime()
+ {
+ return _connection.getLastIoTime();
+ }
+
+ @Override
+ public int getSessionCount()
+ {
+ return _connection.getSessionModels().size();
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java Tue Feb 25 01:19:43 2014
@@ -22,11 +22,9 @@ package org.apache.qpid.server.model.ada
import java.util.Map;
-import org.apache.qpid.server.model.Attribute;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.consumer.Consumer;
@@ -39,7 +37,6 @@ public class ConsumerAdapter extends Abs
private final Consumer _consumer;
private final QueueAdapter _queue;
private final SessionAdapter _session;
- private final ConsumerStatistics _statistics;
public ConsumerAdapter(final QueueAdapter queueAdapter, final SessionAdapter sessionAdapter,
final Consumer consumer)
@@ -52,7 +49,6 @@ public class ConsumerAdapter extends Abs
_consumer = consumer;
_queue = queueAdapter;
_session = sessionAdapter;
- _statistics = new ConsumerStatistics();
//TODO
}
@@ -108,7 +104,7 @@ public class ConsumerAdapter extends Abs
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(org.apache.qpid.server.model.Consumer.class);
+ return getAttributeNames(org.apache.qpid.server.model.Consumer.class);
}
@Override
@@ -161,11 +157,6 @@ public class ConsumerAdapter extends Abs
return super.getAttribute(name); //TODO
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
-
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
@@ -208,38 +199,28 @@ public class ConsumerAdapter extends Abs
return null;
}
- private class ConsumerStatistics implements Statistics
+ @Override
+ public long getBytesOut()
{
+ return _consumer.getBytesOut();
+ }
- public Collection<String> getStatisticNames()
- {
- return AVAILABLE_STATISTICS;
- }
+ @Override
+ public long getMessagesOut()
+ {
+ return _consumer.getMessagesOut();
+ }
- public Object getStatistic(String name)
- {
- if(name.equals(BYTES_OUT))
- {
- return _consumer.getBytesOut();
- }
- else if(name.equals(MESSAGES_OUT))
- {
- return _consumer.getMessagesOut();
- }
- else if(name.equals(STATE_CHANGED))
- {
-
- }
- else if(name.equals(UNACKNOWLEDGED_BYTES))
- {
- return _consumer.getUnacknowledgedBytes();
- }
- else if(name.equals(UNACKNOWLEDGED_MESSAGES))
- {
- return _consumer.getUnacknowledgedMessages();
- }
- return null; // TODO - Implement
- }
+ @Override
+ public long getUnacknowledgedBytes()
+ {
+ return _consumer.getUnacknowledgedBytes();
+ }
+
+ @Override
+ public long getUnacknowledgedMessages()
+ {
+ return _consumer.getUnacknowledgedMessages();
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java Tue Feb 25 01:19:43 2014
@@ -41,13 +41,11 @@ final class ExchangeAdapter extends Abst
private final Map<Binding, BindingAdapter> _bindingAdapters =
new HashMap<Binding, BindingAdapter>();
private VirtualHostAdapter _vhost;
- private final ExchangeStatistics _statistics;
public ExchangeAdapter(final VirtualHostAdapter virtualHostAdapter,
final org.apache.qpid.server.exchange.Exchange exchange)
{
super(exchange.getId(), virtualHostAdapter.getTaskExecutor());
- _statistics = new ExchangeStatistics();
_vhost = virtualHostAdapter;
_exchange = exchange;
addParent(org.apache.qpid.server.model.VirtualHost.class, virtualHostAdapter);
@@ -65,7 +63,7 @@ final class ExchangeAdapter extends Abst
{
if(!_bindingAdapters.containsKey(binding))
{
- QueueAdapter queueAdapter = _vhost.getQueueAdapter(binding.getQueue());
+ QueueAdapter queueAdapter = _vhost.getQueueAdapter(binding.getAMQQueue());
BindingAdapter adapter = new BindingAdapter(binding, this, queueAdapter);
_bindingAdapters.put(binding, adapter);
@@ -203,11 +201,6 @@ final class ExchangeAdapter extends Abst
return 0; //TODO
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
-
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
@@ -256,7 +249,7 @@ final class ExchangeAdapter extends Abst
{
if(!_bindingAdapters.containsKey(binding))
{
- QueueAdapter queueAdapter = _vhost.getQueueAdapter(binding.getQueue());
+ QueueAdapter queueAdapter = _vhost.getQueueAdapter(binding.getAMQQueue());
adapter = new BindingAdapter(binding, this, queueAdapter);
_bindingAdapters.put(binding,adapter);
queueAdapter.bindingRegistered(binding,adapter);
@@ -277,7 +270,7 @@ final class ExchangeAdapter extends Abst
}
if(adapter != null)
{
- QueueAdapter queueAdapter = _vhost.getQueueAdapter(binding.getQueue());
+ QueueAdapter queueAdapter = _vhost.getQueueAdapter(binding.getAMQQueue());
if(queueAdapter != null)
{
queueAdapter.bindingUnregistered(binding);
@@ -335,7 +328,7 @@ final class ExchangeAdapter extends Abst
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Exchange.class);
+ return getAttributeNames(Exchange.class);
}
@Override
@@ -367,46 +360,34 @@ final class ExchangeAdapter extends Abst
_vhost.getSecurityManager().authoriseUpdate(_exchange);
}
- private class ExchangeStatistics implements Statistics
+ @Override
+ public long getBindingCount()
{
+ return _exchange.getBindingCount();
+ }
- public Collection<String> getStatisticNames()
- {
- return AVAILABLE_STATISTICS;
- }
+ @Override
+ public long getBytesDropped()
+ {
+ return _exchange.getByteDrops();
+ }
- public Object getStatistic(String name)
- {
- if(BINDING_COUNT.equals(name))
- {
- return _exchange.getBindingCount();
- }
- else if(BYTES_DROPPED.equals(name))
- {
- return _exchange.getByteDrops();
- }
- else if(BYTES_IN.equals(name))
- {
- return _exchange.getByteReceives();
- }
- else if(MESSAGES_DROPPED.equals(name))
- {
- return _exchange.getMsgDrops();
- }
- else if(MESSAGES_IN.equals(name))
- {
- return _exchange.getMsgReceives();
- }
- else if(PRODUCER_COUNT.equals(name))
- {
+ @Override
+ public long getBytesIn()
+ {
+ return _exchange.getByteReceives();
+ }
- }
- else if(STATE_CHANGED.equals(name))
- {
+ @Override
+ public long getMessagesDropped()
+ {
+ return _exchange.getMsgDrops();
+ }
- }
- return null; // TODO - Implement
- }
+ @Override
+ public long getMessagesIn()
+ {
+ return _exchange.getMsgReceives();
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java Tue Feb 25 01:19:43 2014
@@ -31,7 +31,6 @@ import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
import java.security.AccessControlException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -93,7 +92,7 @@ public class FileSystemPreferencesProvid
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(FileSystemPreferencesProvider.class);
+ return getAttributeNames(FileSystemPreferencesProvider.class);
}
@Override
@@ -159,12 +158,6 @@ public class FileSystemPreferencesProvid
}
@Override
- public Statistics getStatistics()
- {
- return NoStatistics.getInstance();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return Collections.emptySet();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java Tue Feb 25 01:19:43 2014
@@ -49,7 +49,7 @@ public class GroupProviderAdapter extend
public GroupProviderAdapter(UUID id, Broker broker, GroupManager groupManager, Map<String, Object> attributes, Collection<String> attributeNames)
{
- super(id, null, null, broker.getTaskExecutor());
+ super(id, Collections.<String,Object>emptyMap(), Collections.<String,Object>emptyMap(), broker.getTaskExecutor());
if (groupManager == null)
{
@@ -77,7 +77,7 @@ public class GroupProviderAdapter extend
protected Collection<String> createSupportedAttributes(Collection<String> factoryAttributes)
{
- List<String> attributesNames = new ArrayList<String>(Attribute.getAttributeNames(GroupProvider.class));
+ List<String> attributesNames = new ArrayList<String>(getAttributeNames(GroupProvider.class));
if (factoryAttributes != null)
{
attributesNames.addAll(factoryAttributes);
@@ -146,12 +146,6 @@ public class GroupProviderAdapter extend
}
@Override
- public Statistics getStatistics()
- {
- return NoStatistics.getInstance();
- }
-
- @Override
public Collection<String> getAttributeNames()
{
return _supportedAttributes;
@@ -427,12 +421,6 @@ public class GroupProviderAdapter extend
}
@Override
- public Statistics getStatistics()
- {
- return NoStatistics.getInstance();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(
Class<C> clazz)
{
@@ -479,7 +467,7 @@ public class GroupProviderAdapter extend
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Group.class);
+ return getAttributeNames(Group.class);
}
@Override
@@ -538,7 +526,7 @@ public class GroupProviderAdapter extend
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(GroupMember.class);
+ return getAttributeNames(GroupMember.class);
}
@Override
@@ -616,12 +604,6 @@ public class GroupProviderAdapter extend
}
@Override
- public Statistics getStatistics()
- {
- return NoStatistics.getInstance();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(
Class<C> clazz)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java Tue Feb 25 01:19:43 2014
@@ -40,13 +40,11 @@ import javax.net.ssl.KeyManagerFactory;
import javax.security.auth.Subject;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.Attribute;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.security.*;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.util.MapValueConverter;
@@ -105,7 +103,7 @@ public class KeyStoreAdapter extends Abs
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(KeyStore.class);
+ return getAttributeNames(KeyStore.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java Tue Feb 25 01:19:43 2014
@@ -226,12 +226,6 @@ abstract public class PortAdapter<X exte
}
@Override
- public Statistics getStatistics()
- {
- return NoStatistics.getInstance();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
if(clazz == Connection.class)
@@ -279,7 +273,7 @@ abstract public class PortAdapter<X exte
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Port.class);
+ return getAttributeNames(Port.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java Tue Feb 25 01:19:43 2014
@@ -65,7 +65,6 @@ final class QueueAdapter<Q extends AMQQu
private final VirtualHostAdapter _vhost;
- private QueueStatisticsAdapter _statistics;
private QueueNotificationListener _queueNotificationListener;
public QueueAdapter(final VirtualHostAdapter virtualHostAdapter, final AMQQueue<?,Q,?> queue)
@@ -77,7 +76,6 @@ final class QueueAdapter<Q extends AMQQu
_queue = queue;
_queue.addConsumerRegistrationListener(this);
populateConsumers();
- _statistics = new QueueStatisticsAdapter(queue);
_queue.setNotificationListener(this);
}
@@ -333,7 +331,7 @@ final class QueueAdapter<Q extends AMQQu
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Queue.class);
+ return getAttributeNames(Queue.class);
}
@Override
@@ -608,10 +606,6 @@ final class QueueAdapter<Q extends AMQQu
return super.getAttribute(name);
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
@@ -748,101 +742,121 @@ final class QueueAdapter<Q extends AMQQu
}
- private static class QueueStatisticsAdapter implements Statistics
+ @Override
+ public long getBytesIn()
{
+ return _queue.getTotalEnqueueSize();
+ }
- private final AMQQueue _queue;
+ @Override
+ public long getBytesOut()
+ {
+ return _queue.getTotalDequeueSize();
+ }
- public QueueStatisticsAdapter(AMQQueue queue)
- {
- _queue = queue;
- }
+ @Override
+ public long getMessagesIn()
+ {
+ return _queue.getTotalEnqueueCount();
+ }
- public Collection<String> getStatisticNames()
- {
- return Queue.AVAILABLE_STATISTICS;
- }
+ @Override
+ public long getMessagesOut()
+ {
+ return _queue.getTotalDequeueCount();
+ }
+ @Override
+ public long getBindingCount()
+ {
+ return _queue.getBindingCount();
+ }
- public Object getStatistic(String name)
- {
- if(BINDING_COUNT.equals(name))
- {
- return _queue.getBindingCount();
- }
- else if(CONSUMER_COUNT.equals(name))
- {
- return _queue.getConsumerCount();
- }
- else if(CONSUMER_COUNT_WITH_CREDIT.equals(name))
- {
- return _queue.getActiveConsumerCount();
- }
- else if(DISCARDS_TTL_BYTES.equals(name))
- {
- return null; // TODO
- }
- else if(DISCARDS_TTL_MESSAGES.equals(name))
- {
- return null; // TODO
- }
- else if(PERSISTENT_DEQUEUED_BYTES.equals(name))
- {
- return _queue.getPersistentByteDequeues();
- }
- else if(PERSISTENT_DEQUEUED_MESSAGES.equals(name))
- {
- return _queue.getPersistentMsgDequeues();
- }
- else if(PERSISTENT_ENQUEUED_BYTES.equals(name))
- {
- return _queue.getPersistentByteEnqueues();
- }
- else if(PERSISTENT_ENQUEUED_MESSAGES.equals(name))
- {
- return _queue.getPersistentMsgEnqueues();
- }
- else if(QUEUE_DEPTH_BYTES.equals(name))
- {
- return _queue.getQueueDepth();
- }
- else if(QUEUE_DEPTH_MESSAGES.equals(name))
- {
- return _queue.getMessageCount();
- }
- else if(STATE_CHANGED.equals(name))
- {
- return null; // TODO
- }
- else if(TOTAL_DEQUEUED_BYTES.equals(name))
- {
- return _queue.getTotalDequeueSize();
- }
- else if(TOTAL_DEQUEUED_MESSAGES.equals(name))
- {
- return _queue.getTotalDequeueCount();
- }
- else if(TOTAL_ENQUEUED_BYTES.equals(name))
- {
- return _queue.getTotalEnqueueSize();
- }
- else if(TOTAL_ENQUEUED_MESSAGES.equals(name))
- {
- return _queue.getTotalEnqueueCount();
- }
- else if(UNACKNOWLEDGED_BYTES.equals(name))
- {
- return _queue.getUnackedMessageBytes();
- }
- else if(UNACKNOWLEDGED_MESSAGES.equals(name))
- {
- return _queue.getUnackedMessageCount();
- }
+ @Override
+ public long getConsumerCount()
+ {
+ return _queue.getConsumerCount();
+ }
- return null;
- }
+ @Override
+ public long getConsumerCountWithCredit()
+ {
+ return _queue.getActiveConsumerCount();
+ }
+
+ @Override
+ public long getPersistentDequeuedBytes()
+ {
+ return _queue.getPersistentByteDequeues();
+ }
+
+ @Override
+ public long getPersistentDequeuedMessages()
+ {
+ return _queue.getPersistentMsgDequeues();
+ }
+
+ @Override
+ public long getPersistentEnqueuedBytes()
+ {
+ return _queue.getPersistentByteEnqueues();
+ }
+
+ @Override
+ public long getPersistentEnqueuedMessages()
+ {
+ return _queue.getPersistentMsgEnqueues();
+ }
+
+ @Override
+ public long getQueueDepthBytes()
+ {
+ return _queue.getQueueDepth();
+ }
+
+ @Override
+ public long getQueueDepthMessages()
+ {
+ return _queue.getMessageCount();
+ }
+
+ @Override
+ public long getTotalDequeuedBytes()
+ {
+ return _queue.getTotalDequeueSize();
+ }
+
+ @Override
+ public long getTotalDequeuedMessages()
+ {
+ return _queue.getTotalDequeueCount();
+ }
+
+ @Override
+ public long getTotalEnqueuedBytes()
+ {
+ return _queue.getTotalEnqueueSize();
+ }
+
+ @Override
+ public long getTotalEnqueuedMessages()
+ {
+ return _queue.getTotalEnqueueCount();
+ }
+
+ @Override
+ public long getUnacknowledgedBytes()
+ {
+ return _queue.getUnackedMessageBytes();
}
@Override
+ public long getUnacknowledgedMessages()
+ {
+ return _queue.getUnackedMessageCount();
+ }
+
+
+ @Override
public void setNotificationListener(QueueNotificationListener listener)
{
_queueNotificationListener = listener;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java Tue Feb 25 01:19:43 2014
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
@@ -40,14 +39,12 @@ final class SessionAdapter extends Abstr
private AMQSessionModel _session;
- private SessionStatistics _statistics;
private Map<Consumer, ConsumerAdapter> _consumerAdapters = new HashMap<Consumer, ConsumerAdapter>();
public SessionAdapter(final AMQSessionModel session, TaskExecutor taskExecutor)
{
super(UUIDGenerator.generateRandomUUID(), taskExecutor);
_session = session;
- _statistics = new SessionStatistics();
}
@Override
@@ -158,7 +155,7 @@ final class SessionAdapter extends Abstr
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(Session.class);
+ return getAttributeNames(Session.class);
}
@Override
@@ -183,11 +180,6 @@ final class SessionAdapter extends Abstr
return super.getAttribute(name); //TODO - Implement
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
-
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
@@ -211,68 +203,38 @@ final class SessionAdapter extends Abstr
throw new UnsupportedOperationException();
}
- private class SessionStatistics implements Statistics
+ @Override
+ public long getConsumerCount()
{
+ return _session.getConsumerCount();
+ }
- public SessionStatistics()
- {
- }
+ @Override
+ public long getLocalTransactionBegins()
+ {
+ return _session.getTxnStart();
+ }
- public Collection<String> getStatisticNames()
- {
- return AVAILABLE_STATISTICS;
- }
-
- public Object getStatistic(String name)
- {
- if(name.equals(BYTES_IN))
- {
- }
- else if(name.equals(BYTES_OUT))
- {
- }
- else if(name.equals(CONSUMER_COUNT))
- {
- return _session.getConsumerCount();
- }
- else if(name.equals(LOCAL_TRANSACTION_BEGINS))
- {
- return _session.getTxnStart();
- }
- else if(name.equals(LOCAL_TRANSACTION_OPEN))
- {
- long open = _session.getTxnStart() - (_session.getTxnCommits() + _session.getTxnRejects());
- return (Boolean) (open > 0l);
- }
- else if(name.equals(LOCAL_TRANSACTION_ROLLBACKS))
- {
- return _session.getTxnRejects();
- }
- else if(name.equals(STATE_CHANGED))
- {
- }
- else if(name.equals(UNACKNOWLEDGED_BYTES))
- {
- }
- else if(name.equals(UNACKNOWLEDGED_MESSAGES))
- {
- return _session.getUnacknowledgedMessageCount();
- }
- else if(name.equals(XA_TRANSACTION_BRANCH_ENDS))
- {
- }
- else if(name.equals(XA_TRANSACTION_BRANCH_STARTS))
- {
- }
- else if(name.equals(XA_TRANSACTION_BRANCH_SUSPENDS))
- {
+ @Override
+ public int getLocalTransactionOpen()
+ {
+ long open = _session.getTxnStart() - (_session.getTxnCommits() + _session.getTxnRejects());
+ return (open > 0l) ? 1 : 0;
+ }
- }
+ @Override
+ public long getLocalTransactionRollbacks()
+ {
+ return _session.getTxnRejects();
+ }
- return null; // TODO - Implement
- }
+ @Override
+ public long getUnacknowledgedMessages()
+ {
+ return _session.getUnacknowledgedMessageCount();
}
+
@Override
protected boolean setState(State currentState, State desiredState)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java Tue Feb 25 01:19:43 2014
@@ -41,14 +41,12 @@ import javax.net.ssl.X509TrustManager;
import javax.security.auth.Subject;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.Attribute;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.security.*;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManagerFactory;
@@ -102,7 +100,7 @@ public class TrustStoreAdapter extends A
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(TrustStore.class);
+ return getAttributeNames(TrustStore.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java Tue Feb 25 01:19:43 2014
@@ -91,7 +91,6 @@ public final class VirtualHostAdapter ex
private final Map<org.apache.qpid.server.exchange.Exchange, ExchangeAdapter> _exchangeAdapters =
new HashMap<org.apache.qpid.server.exchange.Exchange, ExchangeAdapter>();
- private StatisticsAdapter _statistics;
private final Broker<?> _broker;
private final List<VirtualHostAlias> _aliases = new ArrayList<VirtualHostAlias>();
private StatisticsGatherer _brokerStatisticsGatherer;
@@ -511,11 +510,6 @@ public final class VirtualHostAdapter ex
throw new IllegalStateException();
}
- public Statistics getStatistics()
- {
- return _statistics;
- }
-
@Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
@@ -909,7 +903,7 @@ public final class VirtualHostAdapter ex
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(VirtualHost.class);
+ return getAttributeNames(VirtualHost.class);
}
private void checkVHostStateIsActive()
@@ -1053,49 +1047,46 @@ public final class VirtualHostAdapter ex
return (String) getAttribute(CONFIG_PATH);
}
- private static class VirtualHostStatisticsAdapter extends StatisticsAdapter
+ @Override
+ public long getQueueCount()
{
- private final org.apache.qpid.server.virtualhost.VirtualHost _vhost;
+ return _virtualHost.getQueues().size();
+ }
- private static final Collection<String> VHOST_STATS = Arrays.asList(
- VirtualHost.QUEUE_COUNT,
- VirtualHost.EXCHANGE_COUNT,
- VirtualHost.CONNECTION_COUNT);
+ @Override
+ public long getExchangeCount()
+ {
+ return _virtualHost.getExchanges().size();
+ }
- public VirtualHostStatisticsAdapter(org.apache.qpid.server.virtualhost.VirtualHost virtualHost)
- {
- super(virtualHost);
- _vhost = virtualHost;
- }
+ @Override
+ public long getConnectionCount()
+ {
+ return _virtualHost.getConnectionRegistry().getConnections().size();
+ }
- @Override
- public Collection<String> getStatisticNames()
- {
- Set<String> stats = new HashSet<String>(super.getStatisticNames());
- stats.addAll(VHOST_STATS);
- return stats;
- }
+ @Override
+ public long getBytesIn()
+ {
+ return _virtualHost.getDataReceiptStatistics().getTotal();
+ }
- @Override
- public Object getStatistic(String name)
- {
- if(VirtualHost.QUEUE_COUNT.equals(name))
- {
- return _vhost.getQueues().size();
- }
- else if(VirtualHost.EXCHANGE_COUNT.equals(name))
- {
- return _vhost.getExchanges().size();
- }
- else if(VirtualHost.CONNECTION_COUNT.equals(name))
- {
- return _vhost.getConnectionRegistry().getConnections().size();
- }
- else
- {
- return super.getStatistic(name);
- }
- }
+ @Override
+ public long getBytesOut()
+ {
+ return _virtualHost.getDataDeliveryStatistics().getTotal();
+ }
+
+ @Override
+ public long getMessagesIn()
+ {
+ return _virtualHost.getMessageReceiptStatistics().getTotal();
+ }
+
+ @Override
+ public long getMessagesOut()
+ {
+ return _virtualHost.getMessageDeliveryStatistics().getTotal();
}
@@ -1202,7 +1193,6 @@ public final class VirtualHostAdapter ex
virtualHostRegistry.registerVirtualHost(_virtualHost);
- _statistics = new VirtualHostStatisticsAdapter(_virtualHost);
_virtualHost.addVirtualHostListener(this);
populateQueues();
populateExchanges();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java Tue Feb 25 01:19:43 2014
@@ -27,7 +27,6 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostAlias;
@@ -124,12 +123,6 @@ public class VirtualHostAliasAdapter ext
}
@Override
- public Statistics getStatistics()
- {
- return NoStatistics.getInstance();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return Collections.emptySet();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java Tue Feb 25 01:19:43 2014
@@ -254,8 +254,8 @@ public class SecurityManager implements
public void authoriseCreateBinding(Binding binding)
{
- final Exchange exch = binding.getExchange();
- final AMQQueue queue = binding.getQueue();
+ final Exchange exch = binding.getExchangeImpl();
+ final AMQQueue queue = binding.getAMQQueue();
final String bindingKey = binding.getBindingKey();
boolean allowed =
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java Tue Feb 25 01:19:43 2014
@@ -34,7 +34,6 @@ import org.apache.qpid.server.model.Exch
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class DurableConfigurationStoreHelper
{
@@ -111,8 +110,8 @@ public class DurableConfigurationStoreHe
{
Map<String, Object> attributesMap = new HashMap<String, Object>();
attributesMap.put(Binding.NAME, binding.getBindingKey());
- attributesMap.put(Binding.EXCHANGE, binding.getExchange().getId());
- attributesMap.put(Binding.QUEUE, binding.getQueue().getId());
+ attributesMap.put(Binding.EXCHANGE, binding.getExchangeImpl().getId());
+ attributesMap.put(Binding.QUEUE, binding.getAMQQueue().getId());
Map<String, Object> arguments = binding.getArguments();
if (arguments != null)
{
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=1571510&r1=1571509&r2=1571510&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 Tue Feb 25 01:19:43 2014
@@ -113,6 +113,7 @@ public class QueueRecoverer extends Abst
{
Map<String, Object> attributes = new LinkedHashMap<String, Object>(_attributes);
attributes.put(Queue.ID, _id);
+ attributes.put(Queue.DURABLE, true);
_queue = _queueFactory.restoreQueue(attributes);
}
return _queue;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Tue Feb 25 01:19:43 2014
@@ -141,7 +141,7 @@ abstract class AbstractQueueTestBase<E e
assertEquals("Wrong exchange bound", _routingKey,
_queue.getBindings().get(0).getBindingKey());
assertEquals("Wrong exchange bound", _exchange,
- _queue.getBindings().get(0).getExchange());
+ _queue.getBindings().get(0).getExchangeImpl());
_exchange.getBinding(_routingKey, _queue).delete();
assertFalse("Routing key was still bound",
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java Tue Feb 25 01:19:43 2014
@@ -216,7 +216,7 @@ public class StandardVirtualHostTest ext
boolean foundPing = false;
for (Binding binding : bindings)
{
- String qn = binding.getQueue().getName();
+ String qn = binding.getAMQQueue().getName();
assertEquals("Unexpected queue name", getName(), qn);
Map<String, Object> arguments = binding.getArguments();
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Tue Feb 25 01:19:43 2014
@@ -224,8 +224,8 @@ public class SendingLink_1_0 implements
List<Binding> bindingsToRemove = new ArrayList<Binding>();
for(Binding existingBinding : bindings)
{
- if(existingBinding.getExchange() != _vhost.getDefaultExchange()
- && existingBinding.getExchange() != exchange)
+ if(existingBinding.getExchangeImpl() != _vhost.getDefaultExchange()
+ && existingBinding.getExchangeImpl() != exchange)
{
bindingsToRemove.add(existingBinding);
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Tue Feb 25 01:19:43 2014
@@ -33,11 +33,11 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
import org.apache.qpid.server.model.ManagedObject;
-import org.apache.qpid.server.model.Attribute;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.plugin.SystemNodeCreator;
import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -215,7 +215,8 @@ class ManagementNode implements MessageS
}
}
managedEntityType = new ManagedEntityType(clazz.getName(), parentSet.toArray(new ManagedEntityType[parentSet.size()]),
- (String[])(Attribute.getAttributeNames(clazz).toArray(new String[0])),
+ (String[])(AbstractConfiguredObject.getAttributeNames(
+ clazz).toArray(new String[0])),
opsList.toArray(new String[opsList.size()]));
_entityTypes.put(clazz.getName(),managedEntityType);
_entities.put(managedEntityType, Collections.synchronizedMap(new LinkedHashMap<String, ConfiguredObject>()));
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Tue Feb 25 01:19:43 2014
@@ -430,7 +430,7 @@ public class HttpManagement extends Abst
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(HttpManagement.class);
+ return getAttributeNames(HttpManagement.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Tue Feb 25 01:19:43 2014
@@ -21,14 +21,12 @@ package org.apache.qpid.server.managemen
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
-import org.apache.qpid.server.model.Statistics;
public class ConfiguredObjectToMapConverter
{
@@ -81,25 +79,14 @@ public class ConfiguredObjectToMapConver
private void incorporateStatisticsIntoMap(
final ConfiguredObject confObject, Map<String, Object> object)
{
- Statistics statistics = confObject.getStatistics();
- Map<String, Object> statMap = new HashMap<String, Object>();
- if (statistics != null)
- {
- for(String name : statistics.getStatisticNames())
- {
- Object value = statistics.getStatistic(name);
- if(value != null)
- {
- statMap.put(name, value);
- }
- }
+ Map<String, Object> statMap = confObject.getStatistics();
- if(!statMap.isEmpty())
- {
- object.put(STATISTICS_MAP_KEY, statMap);
- }
+ if(!statMap.isEmpty())
+ {
+ object.put(STATISTICS_MAP_KEY, statMap);
}
+
}
private void incorporateChildrenIntoMap(
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java Tue Feb 25 01:19:43 2014
@@ -106,7 +106,7 @@ public class MessageServlet extends Abst
response.setContentType("application/json");
final List<Map<String, Object>> messages = messageCollector.getMessages();
- int queueSize = ((Number) queue.getStatistics().getStatistic(Queue.QUEUE_DEPTH_MESSAGES)).intValue();
+ int queueSize = (int) queue.getQueueDepthMessages();
String min = messages.isEmpty() ? "0" : messages.get(0).get("position").toString();
String max = messages.isEmpty() ? "0" : messages.get(messages.size()-1).get("position").toString();
response.setHeader("Content-Range", (min + "-" + max + "/" + queueSize));
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Tue Feb 25 01:19:43 2014
@@ -25,6 +25,7 @@ import static org.apache.qpid.server.man
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -32,7 +33,6 @@ import junit.framework.TestCase;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
-import org.apache.qpid.server.model.Statistics;
public class ConfiguredObjectToMapConverterTest extends TestCase
{
@@ -50,8 +50,7 @@ public class ConfiguredObjectToMapConver
final String statisticName = "statisticName";
final int statisticValue = 10;
- Statistics mockStatistics = createMockStatistics(statisticName, statisticValue);
- when(_configuredObject.getStatistics()).thenReturn(mockStatistics);
+ when(_configuredObject.getStatistics()).thenReturn(Collections.singletonMap(statisticName, (Number) statisticValue));
Map<String, Object> resultMap = _converter.convertObjectToMap(_configuredObject, ConfiguredObject.class, 0);
Map<String, Object> statsAsMap = (Map<String, Object>) resultMap.get(STATISTICS_MAP_KEY);
@@ -127,14 +126,6 @@ public class ConfiguredObjectToMapConver
when(mockConfiguredObject.getAttribute(attributeName)).thenReturn(attributeValue);
}
- private Statistics createMockStatistics(String statName, int statValue)
- {
- Statistics mockStatistics = mock(Statistics.class);
- when(mockStatistics.getStatisticNames()).thenReturn(Arrays.asList(statName));
- when(mockStatistics.getStatistic(statName)).thenReturn(statValue);
- return mockStatistics;
- }
-
private static interface TestChild extends ConfiguredObject
{
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java Tue Feb 25 01:19:43 2014
@@ -24,9 +24,7 @@ package org.apache.qpid.server.jmx;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.UUID;
@@ -320,7 +318,7 @@ public class JMXManagement extends Abstr
@Override
public Collection<String> getAttributeNames()
{
- return Attribute.getAttributeNames(JMXManagement.class);
+ return getAttributeNames(JMXManagement.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java Tue Feb 25 01:19:43 2014
@@ -66,10 +66,10 @@ abstract class AbstractStatisticsGatheri
final long period = time - _lastStatUpdateTime;
if(period > _statUpdatePeriod)
{
- long messagesReceived = getStatistic(VirtualHost.MESSAGES_IN);
- long messagesSent = getStatistic(VirtualHost.MESSAGES_OUT);
- long bytesReceived = getStatistic(VirtualHost.BYTES_IN);
- long bytesSent = getStatistic(VirtualHost.BYTES_OUT);
+ long messagesReceived = getMessagesIn();
+ long messagesSent = getMessagesOut();
+ long bytesReceived = getBytesIn();
+ long bytesSent = getBytesOut();
double messageReceivedRate = (double)(messagesReceived - _lastMessagesReceived) / (double)period;
double messageSentRate = (double)(messagesSent - _lastMessagesSent) / (double)period;
@@ -109,10 +109,13 @@ abstract class AbstractStatisticsGatheri
}
}
- private long getStatistic(String name)
- {
- return (Long) getConfiguredObject().getStatistics().getStatistic(name);
- }
+ protected abstract long getBytesOut();
+
+ protected abstract long getBytesIn();
+
+ protected abstract long getMessagesOut();
+
+ protected abstract long getMessagesIn();
public synchronized void resetStatistics() throws Exception
{
@@ -147,13 +150,13 @@ abstract class AbstractStatisticsGatheri
public synchronized long getTotalMessagesDelivered()
{
updateStats();
- return getStatistic(Connection.MESSAGES_OUT);
+ return getMessagesOut();
}
public synchronized long getTotalDataDelivered()
{
updateStats();
- return getStatistic(Connection.BYTES_OUT);
+ return getBytesOut();
}
protected final T getConfiguredObject()
@@ -188,13 +191,13 @@ abstract class AbstractStatisticsGatheri
public synchronized long getTotalMessagesReceived()
{
updateStats();
- return getStatistic(Connection.MESSAGES_IN);
+ return getMessagesIn();
}
public synchronized long getTotalDataReceived()
{
updateStats();
- return getStatistic(Connection.BYTES_IN);
+ return getBytesIn();
}
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java Tue Feb 25 01:19:43 2014
@@ -39,7 +39,6 @@ import org.apache.qpid.management.common
import org.apache.qpid.server.jmx.ManagedObject;
import org.apache.qpid.server.model.Connection;
import org.apache.qpid.server.model.Session;
-import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class ConnectionMBean extends AbstractStatisticsGatheringMBean<Connection> implements ManagedConnection
@@ -75,6 +74,30 @@ public class ConnectionMBean extends Abs
register();
}
+ @Override
+ protected long getBytesOut()
+ {
+ return getConfiguredObject().getBytesOut();
+ }
+
+ @Override
+ protected long getBytesIn()
+ {
+ return getConfiguredObject().getBytesIn();
+ }
+
+ @Override
+ protected long getMessagesOut()
+ {
+ return getConfiguredObject().getMessagesOut();
+ }
+
+ @Override
+ protected long getMessagesIn()
+ {
+ return getConfiguredObject().getMessagesIn();
+ }
+
public String getObjectInstanceName()
{
return ObjectName.quote(getRemoteAddress());
@@ -108,8 +131,7 @@ public class ConnectionMBean extends Abs
public Date getLastIoTime()
{
- Long lastIo = (Long) getConfiguredObject().getStatistics().getStatistic(Connection.LAST_IO_TIME);
- return new Date(lastIo);
+ return new Date(getConfiguredObject().getLastIoTime());
}
public Long getMaximumNumberOfChannels()
@@ -124,10 +146,10 @@ public class ConnectionMBean extends Abs
for (Session session : list)
{
- Statistics statistics = session.getStatistics();
- Long txnBegins = (Long) statistics.getStatistic(Session.LOCAL_TRANSACTION_BEGINS);
+
+ Long txnBegins = session.getLocalTransactionBegins();
Integer channelId = (Integer) session.getAttribute(Session.CHANNEL_ID);
- int unacknowledgedSize = ((Number) statistics.getStatistic(Session.UNACKNOWLEDGED_MESSAGES)).intValue();
+ int unacknowledgedSize = (int) session.getUnacknowledgedMessages();
boolean blocked = (Boolean) session.getAttribute(Session.PRODUCER_FLOW_BLOCKED);
boolean isTransactional = (txnBegins>0l);
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java Tue Feb 25 01:19:43 2014
@@ -149,7 +149,7 @@ public class QueueMBean extends AMQManag
public Integer getMessageCount()
{
- return getStatisticValue(Queue.QUEUE_DEPTH_MESSAGES).intValue();
+ return (int) _queue.getQueueDepthMessages();
}
public Integer getMaximumDeliveryCount()
@@ -159,22 +159,22 @@ public class QueueMBean extends AMQManag
public Long getReceivedMessageCount()
{
- return getStatisticValue(Queue.TOTAL_ENQUEUED_MESSAGES).longValue();
+ return _queue.getTotalEnqueuedMessages();
}
public Long getQueueDepth()
{
- return getStatisticValue(Queue.QUEUE_DEPTH_BYTES).longValue();
+ return _queue.getQueueDepthBytes();
}
public Integer getActiveConsumerCount()
{
- return getStatisticValue(Queue.CONSUMER_COUNT_WITH_CREDIT).intValue();
+ return (int) _queue.getConsumerCountWithCredit();
}
public Integer getConsumerCount()
{
- return getStatisticValue(Queue.CONSUMER_COUNT).intValue();
+ return (int) _queue.getConsumerCount();
}
public String getOwner()
@@ -676,12 +676,6 @@ public class QueueMBean extends AMQManag
_queue.setAttribute(Queue.DESCRIPTION, getDescription(), description);
}
- private Number getStatisticValue(String name)
- {
- final Number statistic = (Number) _queue.getStatistics().getStatistic(name);
- return statistic == null ? Integer.valueOf(0) : statistic;
- }
-
@Override
public String getMessageGroupKey()
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java Tue Feb 25 01:19:43 2014
@@ -45,6 +45,30 @@ public class ServerInformationMBean exte
}
@Override
+ protected long getBytesOut()
+ {
+ return getConfiguredObject().getBytesOut();
+ }
+
+ @Override
+ protected long getBytesIn()
+ {
+ return getConfiguredObject().getBytesIn();
+ }
+
+ @Override
+ protected long getMessagesOut()
+ {
+ return getConfiguredObject().getMessagesOut();
+ }
+
+ @Override
+ protected long getMessagesIn()
+ {
+ return getConfiguredObject().getMessagesIn();
+ }
+
+ @Override
public String getObjectInstanceName()
{
return ServerInformation.TYPE;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java Tue Feb 25 01:19:43 2014
@@ -67,6 +67,29 @@ public class VirtualHostManagerMBean ext
register();
}
+ @Override
+ protected long getBytesOut()
+ {
+ return getConfiguredObject().getBytesOut();
+ }
+
+ @Override
+ protected long getBytesIn()
+ {
+ return getConfiguredObject().getBytesIn();
+ }
+
+ @Override
+ protected long getMessagesOut()
+ {
+ return getConfiguredObject().getMessagesOut();
+ }
+
+ @Override
+ protected long getMessagesIn()
+ {
+ return getConfiguredObject().getMessagesIn();
+ }
@Override
public String getObjectInstanceName()
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java Tue Feb 25 01:19:43 2014
@@ -36,7 +36,6 @@ import org.apache.qpid.server.jmx.Manage
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import org.apache.qpid.server.model.Connection;
import org.apache.qpid.server.model.Session;
-import org.apache.qpid.server.model.Statistics;
public class ConnectionMBeanTest extends TestCase
{
@@ -189,9 +188,8 @@ public class ConnectionMBeanTest extends
public void testGetLastIoTime()
{
- Statistics mockStatistics = mock(Statistics.class);
- when(_mockConnection.getStatistics()).thenReturn(mockStatistics);
- when(mockStatistics.getStatistic(Connection.LAST_IO_TIME)).thenReturn(1L);
+ when(_mockConnection.getLastIoTime()).thenReturn(1l);
+
Object actualValue = _connectionMBean.getLastIoTime();
assertEquals("Unexpected lastIoTime", new Date(1L), actualValue);
@@ -225,11 +223,10 @@ public class ConnectionMBeanTest extends
private Session createMockedSession(int channelId, int unacknowledgedMessages, long localTransactionBegins, boolean blocked)
{
Session mockSession = mock(Session.class);
- Statistics mockSessionStatistics = mock(Statistics.class);
- when(mockSessionStatistics.getStatistic(Session.LOCAL_TRANSACTION_BEGINS)).thenReturn(localTransactionBegins);
- when(mockSessionStatistics.getStatistic(Session.UNACKNOWLEDGED_MESSAGES)).thenReturn(unacknowledgedMessages);
+ when(mockSession.getLocalTransactionBegins()).thenReturn(localTransactionBegins);
+ when(mockSession.getUnacknowledgedMessages()).thenReturn((long)unacknowledgedMessages);
- when(mockSession.getStatistics()).thenReturn(mockSessionStatistics);
+ when(mockSession.getStatistics()).thenReturn(Collections.emptyMap());
when(mockSession.getAttribute(Session.CHANNEL_ID)).thenReturn(channelId);
when(mockSession.getAttribute(Session.PRODUCER_FLOW_BLOCKED)).thenReturn(blocked);
return mockSession;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java Tue Feb 25 01:19:43 2014
@@ -43,7 +43,6 @@ import org.apache.qpid.server.model.Exch
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.queue.NotificationCheck;
import org.apache.qpid.server.queue.QueueEntry;
@@ -61,7 +60,6 @@ public class QueueMBeanTest extends Qpid
private static final String QUEUE_ALTERNATE_EXCHANGE = "QUEUE_ALTERNATE_EXCHANGE";
private Queue _mockQueue;
- private Statistics _mockQueueStatistics;
private VirtualHostMBean _mockVirtualHostMBean;
private ManagedObjectRegistry _mockManagedObjectRegistry;
private QueueMBean _queueMBean;
@@ -71,9 +69,7 @@ public class QueueMBeanTest extends Qpid
{
super.setUp();
_mockQueue = mock(Queue.class);
- _mockQueueStatistics = mock(Statistics.class);
when(_mockQueue.getName()).thenReturn(QUEUE_NAME);
- when(_mockQueue.getStatistics()).thenReturn(_mockQueueStatistics);
_mockVirtualHostMBean = mock(VirtualHostMBean.class);
_mockManagedObjectRegistry = mock(ManagedObjectRegistry.class);
@@ -91,27 +87,32 @@ public class QueueMBeanTest extends Qpid
public void testGetMessageCount() throws Exception
{
- assertStatistic("messageCount", 1000, Queue.QUEUE_DEPTH_MESSAGES);
+ when(_mockQueue.getQueueDepthMessages()).thenReturn(1000l);
+ assertStatistic("messageCount", 1000);
}
public void testGetReceivedMessageCount() throws Exception
{
- assertStatistic("receivedMessageCount", 1000l, Queue.TOTAL_ENQUEUED_MESSAGES);
+ when(_mockQueue.getTotalEnqueuedMessages()).thenReturn(1000l);
+ assertStatistic("receivedMessageCount", 1000l);
}
public void testQueueDepth() throws Exception
{
- assertStatistic("queueDepth", 4096l, Queue.QUEUE_DEPTH_BYTES);
+ when(_mockQueue.getQueueDepthBytes()).thenReturn(4096l);
+ assertStatistic("queueDepth", 4096l);
}
public void testActiveConsumerCount() throws Exception
{
- assertStatistic("activeConsumerCount", 3, Queue.CONSUMER_COUNT_WITH_CREDIT);
+ when(_mockQueue.getConsumerCountWithCredit()).thenReturn(3l);
+ assertStatistic("activeConsumerCount", 3);
}
public void testConsumerCount() throws Exception
{
- assertStatistic("consumerCount", 3, Queue.CONSUMER_COUNT);
+ when(_mockQueue.getConsumerCount()).thenReturn(3l);
+ assertStatistic("consumerCount", 3);
}
/********** Simple Attributes **********/
@@ -364,9 +365,8 @@ public class QueueMBeanTest extends Qpid
});
}
- private void assertStatistic(String jmxAttributeName, Object expectedValue, String underlyingAttributeName) throws Exception
+ private void assertStatistic(String jmxAttributeName, Object expectedValue) throws Exception
{
- when(_mockQueueStatistics.getStatistic(underlyingAttributeName)).thenReturn(expectedValue);
MBeanTestUtils.assertMBeanAttribute(_queueMBean, jmxAttributeName, expectedValue);
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java?rev=1571510&r1=1571509&r2=1571510&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java Tue Feb 25 01:19:43 2014
@@ -25,8 +25,6 @@ import static org.mockito.Mockito.when;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.Statistics;
import junit.framework.TestCase;
@@ -34,7 +32,6 @@ public class ServerInformationMBeanTest
{
private ManagedObjectRegistry _mockManagedObjectRegistry;
private Broker _mockBroker;
- private Statistics _mockBrokerStatistics;
private ServerInformationMBean _mbean;
@Override
@@ -42,8 +39,6 @@ public class ServerInformationMBeanTest
{
_mockManagedObjectRegistry = mock(ManagedObjectRegistry.class);
_mockBroker = mock(Broker.class);
- _mockBrokerStatistics = mock(Statistics.class);
- when(_mockBroker.getStatistics()).thenReturn(_mockBrokerStatistics);
_mbean = new ServerInformationMBean(_mockManagedObjectRegistry, _mockBroker);
}
@@ -58,7 +53,8 @@ public class ServerInformationMBeanTest
public void testGetMessageCount() throws Exception
{
- assertStatistic("totalDataDelivered", 16384l, Connection.BYTES_OUT);
+ when(_mockBroker.getBytesOut()).thenReturn(16384l);
+ assertStatistic("totalDataDelivered", 16384l);
}
/********** Attributes **********/
@@ -80,9 +76,8 @@ public class ServerInformationMBeanTest
assertTrue("isStatisticsEnabled", _mbean.isStatisticsEnabled());
}
- private void assertStatistic(String jmxAttributeName, Object expectedValue, String underlyingAttributeName) throws Exception
+ private void assertStatistic(String jmxAttributeName, Object expectedValue) throws Exception
{
- when(_mockBrokerStatistics.getStatistic(underlyingAttributeName)).thenReturn(expectedValue);
MBeanTestUtils.assertMBeanAttribute(_mbean, jmxAttributeName, expectedValue);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org