QPID-5579 : Use annotations to generate statistics values

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1571510 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 108 insertions, 96 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index a5e30be1a3..3bd21f8b77 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -32,6 +32,7 @@ import javax.jms.JMSException;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.server.model.*;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 public class Asserts
@@ -42,7 +43,7 @@ public class Asserts
     {
         assertNotNull("Virtualhost " + virtualHostName + " data are not found", virtualHost);
         assertAttributesPresent(virtualHost,
-                                Attribute.getAttributeNames(VirtualHost.class),
+                                AbstractConfiguredObject.getAttributeNames(VirtualHost.class),
                                 ConfiguredObject.CREATED_BY,
                                 ConfiguredObject.CREATED_TIME,
                                 ConfiguredObject.LAST_UPDATED_BY,
@@ -78,15 +79,7 @@ public class Asserts
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) virtualHost.get(STATISTICS_ATTRIBUTE);
         Asserts.assertAttributesPresent(statistics,
-                                        VirtualHost.AVAILABLE_STATISTICS,
-                                        VirtualHost.BYTES_RETAINED,
-                                        VirtualHost.LOCAL_TRANSACTION_BEGINS,
-                                        VirtualHost.LOCAL_TRANSACTION_ROLLBACKS,
-                                        VirtualHost.MESSAGES_RETAINED,
-                                        VirtualHost.STATE_CHANGED,
-                                        VirtualHost.XA_TRANSACTION_BRANCH_ENDS,
-                                        VirtualHost.XA_TRANSACTION_BRANCH_STARTS,
-                                        VirtualHost.XA_TRANSACTION_BRANCH_SUSPENDS);
+                                        "queueCount","exchangeCount","bytesIn","bytesOut","messagesIn", "messagesOut");
 
     }
 
@@ -102,7 +95,7 @@ public class Asserts
     {
         assertNotNull("Queue " + queueName + " is not found!", queueData);
         Asserts.assertAttributesPresent(queueData,
-                                        Attribute.getAttributeNames(Queue.class),
+                                        AbstractConfiguredObject.getAttributeNames(Queue.class),
                                         Queue.CREATED_BY,
                                         Queue.CREATED_TIME,
                                         Queue.LAST_UPDATED_BY,
@@ -154,8 +147,23 @@ public class Asserts
         assertNotNull("Unexpected value of queue attribute statistics", queueData.get(Asserts.STATISTICS_ATTRIBUTE));
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) queueData.get(Asserts.STATISTICS_ATTRIBUTE);
-        Asserts.assertAttributesPresent(statistics, Queue.AVAILABLE_STATISTICS, Queue.DISCARDS_TTL_BYTES,
-                                        Queue.DISCARDS_TTL_MESSAGES, Queue.STATE_CHANGED);
+
+        Asserts.assertAttributesPresent(statistics, 
+                                        "bindingCount",
+                                        "consumerCount",
+                                        "consumerCountWithCredit",
+                                        "persistentDequeuedBytes",
+                                        "persistentDequeuedMessages",
+                                        "persistentEnqueuedBytes",
+                                        "persistentEnqueuedMessages",
+                                        "queueDepthBytes",
+                                        "queueDepthMessages",
+                                        "totalDequeuedBytes",
+                                        "totalDequeuedMessages",
+                                        "totalEnqueuedBytes",
+                                        "totalEnqueuedMessages",
+                                        "unacknowledgedBytes",
+                                        "unacknowledgedMessages");
     }
 
     public static void assertAttributesPresent(Map<String, Object> data, String... attributes)
@@ -193,7 +201,7 @@ public class Asserts
     {
         assertNotNull("Unexpected connection data", connectionData);
         assertAttributesPresent(connectionData,
-                                Attribute.getAttributeNames(Connection.class),
+                                AbstractConfiguredObject.getAttributeNames(Connection.class),
                                 Connection.STATE,
                                 Connection.DURABLE,
                                 Connection.LIFETIME_POLICY,
@@ -221,16 +229,17 @@ public class Asserts
 
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) connectionData.get(STATISTICS_ATTRIBUTE);
+ 
+
         assertAttributesPresent(statistics,
-                                Connection.AVAILABLE_STATISTICS,
-                                Connection.LOCAL_TRANSACTION_BEGINS,
-                                Connection.LOCAL_TRANSACTION_ROLLBACKS,
-                                Connection.STATE_CHANGED,
-                                Connection.XA_TRANSACTION_BRANCH_ENDS,
-                                Connection.XA_TRANSACTION_BRANCH_STARTS,
-                                Connection.XA_TRANSACTION_BRANCH_SUSPENDS);
-        assertEquals("Unexpected value of connection statistics attribute " + Connection.SESSION_COUNT, 1,
-                     statistics.get(Connection.SESSION_COUNT));
+                                "bytesIn",
+                                "bytesOut",
+                                "lastIoTime",
+                                "messagesIn",
+                                "messagesOut",
+                                "sessionCount");
+        assertEquals("Unexpected value of connection statistics attribute sessionCount ", 1,
+                     statistics.get("sessionCount"));
     }
 
     public static void assertPortAttributes(Map<String, Object> port)
@@ -262,7 +271,7 @@ public class Asserts
         if (isAMQPPort)
         {
             assertAttributesPresent(port,
-                                    Attribute.getAttributeNames(Port.class),
+                                    AbstractConfiguredObject.getAttributeNames(Port.class),
                                     ConfiguredObject.TYPE,
                                     ConfiguredObject.CREATED_BY,
                                     ConfiguredObject.CREATED_TIME,
@@ -277,7 +286,7 @@ public class Asserts
         else
         {
             assertAttributesPresent(port,
-                                    Attribute.getAttributeNames(Port.class),
+                                    AbstractConfiguredObject.getAttributeNames(Port.class),
                                     ConfiguredObject.TYPE,
                                     ConfiguredObject.CREATED_BY,
                                     ConfiguredObject.CREATED_TIME,
@@ -312,7 +321,7 @@ public class Asserts
     public static void assertExchange(String exchangeName, String type, Map<String, Object> exchangeData)
     {
         assertNotNull("Exchange " + exchangeName + " is not found!", exchangeData);
-        assertAttributesPresent(exchangeData, Attribute.getAttributeNames(Exchange.class),
+        assertAttributesPresent(exchangeData, AbstractConfiguredObject.getAttributeNames(Exchange.class),
                                 Exchange.ALTERNATE_EXCHANGE, Exchange.TIME_TO_LIVE,
                                 ConfiguredObject.CREATED_BY,
                                 ConfiguredObject.CREATED_TIME,
@@ -334,17 +343,19 @@ public class Asserts
 
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) exchangeData.get(STATISTICS_ATTRIBUTE);
-        assertAttributesPresent(statistics,
-                                Exchange.AVAILABLE_STATISTICS,
-                                Exchange.STATE_CHANGED,
-                                Exchange.PRODUCER_COUNT);
+
+        assertAttributesPresent(statistics,"bindingCount",
+                                "bytesDropped",
+                                "bytesIn",
+                                "messagesDropped",
+                                "messagesIn");
     }
 
     public static void assertBinding(String bindingName, String queueName, String exchange, Map<String, Object> binding)
     {
         assertNotNull("Binding map should not be null", binding);
         assertAttributesPresent(binding,
-                                Attribute.getAttributeNames(Binding.class),
+                                AbstractConfiguredObject.getAttributeNames(Binding.class),
                                 Binding.STATE,
                                 Binding.TIME_TO_LIVE,
                                 ConfiguredObject.TYPE,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
index e73e8767ac..5e1489a640 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
@@ -27,13 +27,13 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.qpid.server.BrokerOptions;
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.ConfiguredObject;
 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.User;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
 import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -304,7 +304,8 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase
 
     private void assertProvider(boolean managesPrincipals, String type, Map<String, Object> provider)
     {
-        Asserts.assertAttributesPresent(provider, Attribute.getAttributeNames(AuthenticationProvider.class),
+        Asserts.assertAttributesPresent(provider, AbstractConfiguredObject.getAttributeNames(
+                AuthenticationProvider.class),
                 AuthenticationProvider.DESCRIPTION, AuthenticationProvider.TIME_TO_LIVE, ConfiguredObject.CREATED_BY,
                 ConfiguredObject.CREATED_TIME, ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME);
         assertEquals("Unexpected value of provider attribute " + AuthenticationProvider.STATE, State.ACTIVE.name(),
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
index 6c6ce940de..a9705f73d5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
@@ -29,12 +29,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 public class BrokerRestHttpsTest extends QpidRestTestCase
@@ -64,7 +64,7 @@ public class BrokerRestHttpsTest extends QpidRestTestCase
     {
         Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
 
-        Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
+        Asserts.assertAttributesPresent(brokerDetails, AbstractConfiguredObject.getAttributeNames(Broker.class),
                 Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index ab4f358b42..178f365fa5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -34,13 +34,13 @@ import javax.jms.TextMessage;
 
 import org.apache.qpid.common.QpidProperties;
 import org.apache.qpid.server.configuration.BrokerConfigurationStoreCreator;
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 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.VirtualHost;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 import org.apache.qpid.server.store.MessageStoreCreator;
 import org.apache.qpid.test.client.UnroutableMessageTestExceptionListener;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -234,7 +234,7 @@ public class BrokerRestTest extends QpidRestTestCase
 
     protected void assertBrokerAttributes(Map<String, Object> brokerDetails)
     {
-        Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
+        Asserts.assertAttributesPresent(brokerDetails, AbstractConfiguredObject.getAttributeNames(Broker.class),
                 Broker.PROCESS_PID,
                 Broker.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
index 89c53b1e0a..07f1627d94 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
@@ -33,10 +33,10 @@ import javax.jms.MessageProducer;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Connection;
 import org.apache.qpid.server.model.Session;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 
 public class ConnectionRestTest extends QpidRestTestCase
 {
@@ -155,14 +155,14 @@ public class ConnectionRestTest extends QpidRestTestCase
 
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) connectionDetails.get(Asserts.STATISTICS_ATTRIBUTE);
-        assertEquals("Unexpected value of connection statistics attribute " + Connection.BYTES_IN, MESSAGE_NUMBER
-                * MESSAGE_SIZE, statistics.get(Connection.BYTES_IN));
-        assertEquals("Unexpected value of connection statistics attribute " + Connection.BYTES_OUT, MESSAGE_SIZE
-                + ((MESSAGE_NUMBER - 1) * MESSAGE_SIZE) * 2, statistics.get(Connection.BYTES_OUT));
-        assertEquals("Unexpected value of connection statistics attribute " + Connection.MESSAGES_IN, MESSAGE_NUMBER,
-                statistics.get(Connection.MESSAGES_IN));
-        assertEquals("Unexpected value of connection statistics attribute " + Connection.MESSAGES_OUT,
-                MESSAGE_NUMBER * 2 - 1, statistics.get(Connection.MESSAGES_OUT));
+        assertEquals("Unexpected value of connection statistics attribute " + "bytesIn", MESSAGE_NUMBER
+                * MESSAGE_SIZE, statistics.get("bytesIn"));
+        assertEquals("Unexpected value of connection statistics attribute " + "bytesOut", MESSAGE_SIZE
+                + ((MESSAGE_NUMBER - 1) * MESSAGE_SIZE) * 2, statistics.get("bytesOut"));
+        assertEquals("Unexpected value of connection statistics attribute " + "messagesIn", MESSAGE_NUMBER,
+                statistics.get("messagesIn"));
+        assertEquals("Unexpected value of connection statistics attribute " + "messagesOut",
+                MESSAGE_NUMBER * 2 - 1, statistics.get("messagesOut"));
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> sessions = (List<Map<String, Object>>) connectionDetails.get(SESSIONS_ATTRIBUTE);
@@ -174,7 +174,7 @@ public class ConnectionRestTest extends QpidRestTestCase
     private void assertSession(Map<String, Object> sessionData, AMQSession<?, ?> session)
     {
         assertNotNull("Session map cannot be null", sessionData);
-        Asserts.assertAttributesPresent(sessionData, Attribute.getAttributeNames(Session.class),
+        Asserts.assertAttributesPresent(sessionData, AbstractConfiguredObject.getAttributeNames(Session.class),
                                         ConfiguredObject.TYPE,
                                         ConfiguredObject.CREATED_BY,
                                         ConfiguredObject.CREATED_TIME,
@@ -193,19 +193,18 @@ public class ConnectionRestTest extends QpidRestTestCase
 
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) sessionData.get(Asserts.STATISTICS_ATTRIBUTE);
-        Asserts.assertAttributesPresent(statistics, Session.AVAILABLE_STATISTICS, Session.BYTES_IN, Session.BYTES_OUT,
-                Session.STATE_CHANGED, Session.UNACKNOWLEDGED_BYTES, Session.LOCAL_TRANSACTION_OPEN,
-                Session.XA_TRANSACTION_BRANCH_ENDS, Session.XA_TRANSACTION_BRANCH_STARTS,
-                Session.XA_TRANSACTION_BRANCH_SUSPENDS);
-
-        assertEquals("Unexpecte value of statistic attribute " + Session.UNACKNOWLEDGED_MESSAGES, MESSAGE_NUMBER - 1,
-                statistics.get(Session.UNACKNOWLEDGED_MESSAGES));
-        assertEquals("Unexpecte value of statistic attribute " + Session.LOCAL_TRANSACTION_BEGINS, 4,
-                statistics.get(Session.LOCAL_TRANSACTION_BEGINS));
-        assertEquals("Unexpecte value of statistic attribute " + Session.LOCAL_TRANSACTION_ROLLBACKS, 1,
-                statistics.get(Session.LOCAL_TRANSACTION_ROLLBACKS));
-        assertEquals("Unexpecte value of statistic attribute " + Session.CONSUMER_COUNT, 1,
-                statistics.get(Session.CONSUMER_COUNT));
+        Asserts.assertAttributesPresent(statistics, "consumerCount",
+                                        "localTransactionBegins", "localTransactionOpen",
+                                        "localTransactionRollbacks", "unacknowledgedMessages");
+
+        assertEquals("Unexpecte value of statistic attribute " + "unacknowledgedMessages", MESSAGE_NUMBER - 1,
+                statistics.get("unacknowledgedMessages"));
+        assertEquals("Unexpecte value of statistic attribute " + "localTransactionBegins", 4,
+                statistics.get("localTransactionBegins"));
+        assertEquals("Unexpecte value of statistic attribute " + "localTransactionRollbacks", 1,
+                statistics.get("localTransactionRollbacks"));
+        assertEquals("Unexpecte value of statistic attribute " + "consumerCount", 1,
+                statistics.get("consumerCount"));
     }
 
     private String getConnectionName() throws IOException
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
index 85d8d31758..11c0b7bc4a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
@@ -29,13 +29,13 @@ import java.util.Properties;
 import java.util.UUID;
 
 import org.apache.qpid.server.BrokerOptions;
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Group;
 import org.apache.qpid.server.model.GroupProvider;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 import org.apache.qpid.server.security.group.FileGroupManagerFactory;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.test.utils.TestFileUtils;
@@ -322,7 +322,7 @@ public class GroupProviderRestTest extends QpidRestTestCase
 
     private void assertProvider(String name, String type, Map<String, Object> provider)
     {
-        Asserts.assertAttributesPresent(provider, Attribute.getAttributeNames(GroupProvider.class),
+        Asserts.assertAttributesPresent(provider, AbstractConfiguredObject.getAttributeNames(GroupProvider.class),
                 GroupProvider.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
index 9a657b0019..d9ff53a351 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
@@ -28,12 +28,12 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.PreferencesProvider;
 import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 import org.apache.qpid.server.model.adapter.FileSystemPreferencesProvider;
 import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory;
@@ -164,7 +164,7 @@ public class PreferencesProviderRestTest extends QpidRestTestCase
     public void assertProviderCommonAttributes(Map<String, Object> provider)
     {
         Asserts.assertAttributesPresent(provider,
-                                        Attribute.getAttributeNames(PreferencesProvider.class),
+                                        AbstractConfiguredObject.getAttributeNames(PreferencesProvider.class),
                                         ConfiguredObject.CREATED_BY,
                                         ConfiguredObject.CREATED_TIME,
                                         ConfiguredObject.LAST_UPDATED_BY,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
index a95c0a082f..fba319e907 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
@@ -34,12 +34,12 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Consumer;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.adapter.AbstractConfiguredObject;
 
 public class QueueRestTest extends QpidRestTestCase
 {
@@ -212,7 +212,7 @@ public class QueueRestTest extends QpidRestTestCase
     {
         assertNotNull("Consumer map should not be null", consumer);
         Asserts.assertAttributesPresent(consumer,
-                                        Attribute.getAttributeNames(Consumer.class), Consumer.STATE, Consumer.TIME_TO_LIVE,
+                                        AbstractConfiguredObject.getAttributeNames(Consumer.class), Consumer.STATE, Consumer.TIME_TO_LIVE,
                 Consumer.SETTLEMENT_MODE, Consumer.EXCLUSIVE, Consumer.SELECTOR,
                 Consumer.NO_LOCAL,
                 ConfiguredObject.TYPE,
@@ -232,35 +232,35 @@ public class QueueRestTest extends QpidRestTestCase
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) consumer.get(Asserts.STATISTICS_ATTRIBUTE);
         assertNotNull("Consumer statistics is not present", statistics);
-        Asserts.assertAttributesPresent(statistics, Consumer.AVAILABLE_STATISTICS, Consumer.STATE_CHANGED);
+        Asserts.assertAttributesPresent(statistics, "bytesOut", "messagesOut", "unacknowledgedBytes", "unacknowledgedMessages");
     }
 
     private void assertStatistics(Map<String, Object> queueDetails)
     {
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) queueDetails.get(Asserts.STATISTICS_ATTRIBUTE);
-        assertEquals("Unexpected queue statistics attribute " + Queue.PERSISTENT_DEQUEUED_MESSAGES, DEQUEUED_MESSAGES,
-                statistics.get(Queue.PERSISTENT_DEQUEUED_MESSAGES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.QUEUE_DEPTH_MESSAGES, ENQUEUED_MESSAGES,
-                statistics.get(Queue.QUEUE_DEPTH_MESSAGES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.CONSUMER_COUNT, 1,
-                statistics.get(Queue.CONSUMER_COUNT));
-        assertEquals("Unexpected queue statistics attribute " + Queue.CONSUMER_COUNT_WITH_CREDIT, 1,
-                statistics.get(Queue.CONSUMER_COUNT_WITH_CREDIT));
-        assertEquals("Unexpected queue statistics attribute " + Queue.BINDING_COUNT, 1, statistics.get(Queue.BINDING_COUNT));
-        assertEquals("Unexpected queue statistics attribute " + Queue.PERSISTENT_DEQUEUED_MESSAGES, DEQUEUED_MESSAGES,
-                statistics.get(Queue.PERSISTENT_DEQUEUED_MESSAGES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.TOTAL_DEQUEUED_MESSAGES, DEQUEUED_MESSAGES,
-                statistics.get(Queue.TOTAL_DEQUEUED_MESSAGES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.TOTAL_DEQUEUED_BYTES, DEQUEUED_BYTES,
-                statistics.get(Queue.TOTAL_DEQUEUED_BYTES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.PERSISTENT_DEQUEUED_BYTES, DEQUEUED_BYTES,
-                statistics.get(Queue.TOTAL_DEQUEUED_BYTES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.PERSISTENT_ENQUEUED_BYTES, ENQUEUED_BYTES
-                + DEQUEUED_BYTES, statistics.get(Queue.PERSISTENT_ENQUEUED_BYTES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.TOTAL_ENQUEUED_BYTES, ENQUEUED_BYTES + DEQUEUED_BYTES,
-                statistics.get(Queue.TOTAL_ENQUEUED_BYTES));
-        assertEquals("Unexpected queue statistics attribute " + Queue.QUEUE_DEPTH_BYTES, ENQUEUED_BYTES,
-                statistics.get(Queue.QUEUE_DEPTH_BYTES));
+        assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedMessages", DEQUEUED_MESSAGES,
+                statistics.get("persistentDequeuedMessages"));
+        assertEquals("Unexpected queue statistics attribute " + "queueDepthMessages", ENQUEUED_MESSAGES,
+                statistics.get("queueDepthMessages"));
+        assertEquals("Unexpected queue statistics attribute " + "consumerCount", 1,
+                statistics.get("consumerCount"));
+        assertEquals("Unexpected queue statistics attribute " + "consumerCountWithCredit", 1,
+                statistics.get("consumerCountWithCredit"));
+        assertEquals("Unexpected queue statistics attribute " + "bindingCount", 1, statistics.get("bindingCount"));
+        assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedMessages", DEQUEUED_MESSAGES,
+                statistics.get("persistentDequeuedMessages"));
+        assertEquals("Unexpected queue statistics attribute " + "totalDequeuedMessages", DEQUEUED_MESSAGES,
+                statistics.get("totalDequeuedMessages"));
+        assertEquals("Unexpected queue statistics attribute " + "totalDequeuedBytes", DEQUEUED_BYTES,
+                statistics.get("totalDequeuedBytes"));
+        assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedBytes", DEQUEUED_BYTES,
+                statistics.get("totalDequeuedBytes"));
+        assertEquals("Unexpected queue statistics attribute " + "persistentEnqueuedBytes", ENQUEUED_BYTES
+                + DEQUEUED_BYTES, statistics.get("persistentEnqueuedBytes"));
+        assertEquals("Unexpected queue statistics attribute " + "totalEnqueuedBytes", ENQUEUED_BYTES + DEQUEUED_BYTES,
+                statistics.get("totalEnqueuedBytes"));
+        assertEquals("Unexpected queue statistics attribute " + "queueDepthBytes", ENQUEUED_BYTES,
+                statistics.get("queueDepthBytes"));
     }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index d7b17fda8a..eac43e70a4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
@@ -74,9 +74,10 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) hostDetails.get(Asserts.STATISTICS_ATTRIBUTE);
-        assertEquals("Unexpected number of exchanges in statistics", EXPECTED_EXCHANGES.length, statistics.get(VirtualHost.EXCHANGE_COUNT));
-        assertEquals("Unexpected number of queues in statistics", EXPECTED_QUEUES.length, statistics.get(VirtualHost.QUEUE_COUNT));
-        assertEquals("Unexpected number of connections in statistics", 1, statistics.get(VirtualHost.CONNECTION_COUNT));
+        assertEquals("Unexpected number of exchanges in statistics", EXPECTED_EXCHANGES.length, statistics.get(
+                "exchangeCount"));
+        assertEquals("Unexpected number of queues in statistics", EXPECTED_QUEUES.length, statistics.get("queueCount"));
+        assertEquals("Unexpected number of connections in statistics", 1, statistics.get("connectionCount"));
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> exchanges = (List<Map<String, Object>>) hostDetails.get(VIRTUALHOST_EXCHANGES_ATTRIBUTE);
@@ -589,9 +590,9 @@ public class VirtualHostRestTest extends QpidRestTestCase
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) hostDetails.get(Asserts.STATISTICS_ATTRIBUTE);
         assertEquals("Unexpected number of exchanges in statistics", EXPECTED_EXCHANGES.length,
-                statistics.get(VirtualHost.EXCHANGE_COUNT));
-        assertEquals("Unexpected number of queues in statistics", 0, statistics.get(VirtualHost.QUEUE_COUNT));
-        assertEquals("Unexpected number of connections in statistics", 0, statistics.get(VirtualHost.CONNECTION_COUNT));
+                statistics.get("exchangeCount"));
+        assertEquals("Unexpected number of queues in statistics", 0, statistics.get("queueCount"));
+        assertEquals("Unexpected number of connections in statistics", 0, statistics.get("connectionCount"));
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> exchanges = (List<Map<String, Object>>) hostDetails.get(VIRTUALHOST_EXCHANGES_ATTRIBUTE);