QPID-5579 : [Java Broker] build attribute meta data the same way for REST API and AMQP Management

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

10 files changed, 228 insertions, 78 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 1b27ee74f6..a5e30be1a3 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
@@ -41,33 +41,52 @@ public class Asserts
     public static void assertVirtualHost(String virtualHostName, Map<String, Object> virtualHost)
     {
         assertNotNull("Virtualhost " + virtualHostName + " data are not found", virtualHost);
-        assertAttributesPresent(virtualHost, VirtualHost.AVAILABLE_ATTRIBUTES, VirtualHost.TIME_TO_LIVE,
-                VirtualHost.CREATED, VirtualHost.UPDATED, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.STORE_PATH,
-                VirtualHost.CONFIG_PATH, VirtualHost.TYPE, VirtualHost.CONFIG_STORE_PATH, VirtualHost.CONFIG_STORE_TYPE);
-
-        assertEquals("Unexpected value of attribute " + VirtualHost.NAME, virtualHostName, virtualHost.get(VirtualHost.NAME));
+        assertAttributesPresent(virtualHost,
+                                Attribute.getAttributeNames(VirtualHost.class),
+                                ConfiguredObject.CREATED_BY,
+                                ConfiguredObject.CREATED_TIME,
+                                ConfiguredObject.LAST_UPDATED_BY,
+                                ConfiguredObject.LAST_UPDATED_TIME,
+                                ConfiguredObject.DESCRIPTION,
+                                VirtualHost.TIME_TO_LIVE,
+                                VirtualHost.SUPPORTED_QUEUE_TYPES,
+                                VirtualHost.STORE_PATH,
+                                VirtualHost.CONFIG_PATH,
+                                VirtualHost.TYPE,
+                                VirtualHost.CONFIG_STORE_PATH,
+                                VirtualHost.CONFIG_STORE_TYPE);
+
+        assertEquals("Unexpected value of attribute " + VirtualHost.NAME,
+                     virtualHostName,
+                     virtualHost.get(VirtualHost.NAME));
         assertNotNull("Unexpected value of attribute " + VirtualHost.ID, virtualHost.get(VirtualHost.ID));
         assertEquals("Unexpected value of attribute " + VirtualHost.STATE, State.ACTIVE.name(),
-                virtualHost.get(VirtualHost.STATE));
+                     virtualHost.get(VirtualHost.STATE));
         assertEquals("Unexpected value of attribute " + VirtualHost.DURABLE, Boolean.TRUE,
-                virtualHost.get(VirtualHost.DURABLE));
+                     virtualHost.get(VirtualHost.DURABLE));
         assertEquals("Unexpected value of attribute " + VirtualHost.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
-                virtualHost.get(VirtualHost.LIFETIME_POLICY));
+                     virtualHost.get(VirtualHost.LIFETIME_POLICY));
         assertEquals("Unexpected value of attribute " + VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED, Boolean.FALSE,
-                virtualHost.get(VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED));
+                     virtualHost.get(VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED));
 
         @SuppressWarnings("unchecked")
         Collection<String> exchangeTypes = (Collection<String>) virtualHost.get(VirtualHost.SUPPORTED_EXCHANGE_TYPES);
         assertEquals("Unexpected value of attribute " + VirtualHost.SUPPORTED_EXCHANGE_TYPES,
-                new HashSet<String>(Arrays.asList("headers", "topic", "direct", "fanout")),
-                new HashSet<String>(exchangeTypes));
+                     new HashSet<String>(Arrays.asList("headers", "topic", "direct", "fanout")),
+                     new HashSet<String>(exchangeTypes));
 
         @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);
+        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);
 
     }
 
@@ -76,38 +95,59 @@ public class Asserts
         assertQueue(queueName, queueType, queueData, null);
     }
 
-    public static void assertQueue(String queueName, String queueType, Map<String, Object> queueData, Map<String, Object> expectedAttributes)
+    public static void assertQueue(String queueName,
+                                   String queueType,
+                                   Map<String, Object> queueData,
+                                   Map<String, Object> expectedAttributes)
     {
         assertNotNull("Queue " + queueName + " is not found!", queueData);
-        Asserts.assertAttributesPresent(queueData, Queue.AVAILABLE_ATTRIBUTES, Queue.CREATED, Queue.UPDATED,
-                Queue.DESCRIPTION, Queue.TIME_TO_LIVE, Queue.ALTERNATE_EXCHANGE, Queue.OWNER, Queue.NO_LOCAL, Queue.LVQ_KEY,
-                Queue.SORT_KEY, Queue.MESSAGE_GROUP_KEY, Queue.MESSAGE_GROUP_SHARED_GROUPS, Queue.PRIORITIES);
+        Asserts.assertAttributesPresent(queueData,
+                                        Attribute.getAttributeNames(Queue.class),
+                                        Queue.CREATED_BY,
+                                        Queue.CREATED_TIME,
+                                        Queue.LAST_UPDATED_BY,
+                                        Queue.LAST_UPDATED_TIME,
+                                        Queue.TYPE,
+                                        Queue.DESCRIPTION,
+                                        Queue.TIME_TO_LIVE,
+                                        Queue.ALTERNATE_EXCHANGE,
+                                        Queue.OWNER,
+                                        Queue.NO_LOCAL,
+                                        Queue.LVQ_KEY,
+                                        Queue.SORT_KEY,
+                                        Queue.MESSAGE_GROUP_KEY,
+                                        Queue.MESSAGE_GROUP_SHARED_GROUPS,
+                                        Queue.PRIORITIES);
 
         assertEquals("Unexpected value of queue attribute " + Queue.NAME, queueName, queueData.get(Queue.NAME));
         assertNotNull("Unexpected value of queue attribute " + Queue.ID, queueData.get(Queue.ID));
-        assertEquals("Unexpected value of queue attribute " + Queue.STATE, State.ACTIVE.name(), queueData.get(Queue.STATE));
+        assertEquals("Unexpected value of queue attribute " + Queue.STATE,
+                     State.ACTIVE.name(),
+                     queueData.get(Queue.STATE));
         assertEquals("Unexpected value of queue attribute " + Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
-                queueData.get(Queue.LIFETIME_POLICY));
-        assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_TYPE, queueType, queueData.get(Queue.QUEUE_TYPE));
+                     queueData.get(Queue.LIFETIME_POLICY));
+        assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_TYPE,
+                     queueType,
+                     queueData.get(Queue.QUEUE_TYPE));
         if (expectedAttributes == null)
         {
             assertEquals("Unexpected value of queue attribute " + Queue.EXCLUSIVE,
                          ExclusivityPolicy.NONE.name(), queueData.get(Queue.EXCLUSIVE));
             assertEquals("Unexpected value of queue attribute " + Queue.MAXIMUM_DELIVERY_ATTEMPTS, 0,
-                    queueData.get(Queue.MAXIMUM_DELIVERY_ATTEMPTS));
+                         queueData.get(Queue.MAXIMUM_DELIVERY_ATTEMPTS));
             assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 0,
-                    queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES));
+                         queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES));
             assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 0,
-                    queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES));
+                         queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES));
             assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_STOPPED, Boolean.FALSE,
-                    queueData.get(Queue.QUEUE_FLOW_STOPPED));
+                         queueData.get(Queue.QUEUE_FLOW_STOPPED));
         }
         else
         {
             for (Map.Entry<String, Object> attribute : expectedAttributes.entrySet())
             {
                 assertEquals("Unexpected value of " + queueName + " queue attribute " + attribute.getKey(),
-                        attribute.getValue(), queueData.get(attribute.getKey()));
+                             attribute.getValue(), queueData.get(attribute.getKey()));
             }
         }
 
@@ -115,7 +155,7 @@ public class Asserts
         @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);
+                                        Queue.DISCARDS_TTL_MESSAGES, Queue.STATE_CHANGED);
     }
 
     public static void assertAttributesPresent(Map<String, Object> data, String... attributes)
@@ -127,7 +167,7 @@ public class Asserts
     }
 
     public static void assertAttributesPresent(Map<String, Object> data, Collection<String> attributes,
-            String... unsupportedAttributes)
+                                               String... unsupportedAttributes)
     {
         for (String name : attributes)
         {
@@ -148,30 +188,49 @@ public class Asserts
         }
     }
 
-    public static void assertConnection(Map<String, Object> connectionData, AMQConnection connection) throws JMSException
+    public static void assertConnection(Map<String, Object> connectionData, AMQConnection connection)
+            throws JMSException
     {
         assertNotNull("Unexpected connection data", connectionData);
-        assertAttributesPresent(connectionData, Connection.AVAILABLE_ATTRIBUTES, Connection.STATE, Connection.DURABLE,
-                Connection.LIFETIME_POLICY, Connection.TIME_TO_LIVE, Connection.CREATED, Connection.UPDATED,
-                Connection.INCOMING, Connection.REMOTE_PROCESS_NAME, Connection.REMOTE_PROCESS_PID,
-                Connection.LOCAL_ADDRESS, Connection.PROPERTIES);
+        assertAttributesPresent(connectionData,
+                                Attribute.getAttributeNames(Connection.class),
+                                Connection.STATE,
+                                Connection.DURABLE,
+                                Connection.LIFETIME_POLICY,
+                                Connection.TIME_TO_LIVE,
+                                Connection.INCOMING,
+                                Connection.REMOTE_PROCESS_NAME,
+                                Connection.REMOTE_PROCESS_PID,
+                                Connection.LOCAL_ADDRESS,
+                                Connection.PROPERTIES,
+                                ConfiguredObject.TYPE,
+                                ConfiguredObject.CREATED_BY,
+                                ConfiguredObject.CREATED_TIME,
+                                ConfiguredObject.LAST_UPDATED_BY,
+                                ConfiguredObject.LAST_UPDATED_TIME,
+                                ConfiguredObject.DESCRIPTION);
 
         assertEquals("Unexpected value for connection attribute " + Connection.PORT,
-                TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, connectionData.get(Connection.PORT));
+                     TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, connectionData.get(Connection.PORT));
         assertEquals("Unexpected value of connection attribute " + Connection.SESSION_COUNT_LIMIT,
-                (int) connection.getMaximumChannelCount(), connectionData.get(Connection.SESSION_COUNT_LIMIT));
+                     (int) connection.getMaximumChannelCount(), connectionData.get(Connection.SESSION_COUNT_LIMIT));
         assertEquals("Unexpected value of connection attribute " + Connection.CLIENT_ID, "clientid",
-                connectionData.get(Connection.CLIENT_ID));
+                     connectionData.get(Connection.CLIENT_ID));
         assertEquals("Unexpected value of connection attribute " + Connection.PRINCIPAL, "guest",
-                connectionData.get(Connection.PRINCIPAL));
+                     connectionData.get(Connection.PRINCIPAL));
 
         @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);
+        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));
+                     statistics.get(Connection.SESSION_COUNT));
     }
 
     public static void assertPortAttributes(Map<String, Object> port)
@@ -184,7 +243,7 @@ public class Asserts
         assertNotNull("Unexpected value of attribute " + Port.ID, port.get(Port.ID));
         assertEquals("Unexpected value of attribute " + Port.DURABLE, Boolean.FALSE, port.get(Port.DURABLE));
         assertEquals("Unexpected value of attribute " + Port.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
-                port.get(Broker.LIFETIME_POLICY));
+                     port.get(Broker.LIFETIME_POLICY));
         assertEquals("Unexpected value of attribute " + Port.STATE, state.name(), port.get(Port.STATE));
         assertEquals("Unexpected value of attribute " + Port.TIME_TO_LIVE, 0, port.get(Port.TIME_TO_LIVE));
 
@@ -202,20 +261,44 @@ public class Asserts
         }
         if (isAMQPPort)
         {
-            assertAttributesPresent(port, Port.AVAILABLE_ATTRIBUTES, Port.CREATED, Port.UPDATED, Port.AUTHENTICATION_PROVIDER, Port.KEY_STORE, Port.TRUST_STORES);
+            assertAttributesPresent(port,
+                                    Attribute.getAttributeNames(Port.class),
+                                    ConfiguredObject.TYPE,
+                                    ConfiguredObject.CREATED_BY,
+                                    ConfiguredObject.CREATED_TIME,
+                                    ConfiguredObject.LAST_UPDATED_BY,
+                                    ConfiguredObject.LAST_UPDATED_TIME,
+                                    ConfiguredObject.DESCRIPTION,
+                                    Port.AUTHENTICATION_PROVIDER,
+                                    Port.KEY_STORE,
+                                    Port.TRUST_STORES);
             assertNotNull("Unexpected value of attribute " + Port.BINDING_ADDRESS, port.get(Port.BINDING_ADDRESS));
         }
         else
         {
-            assertAttributesPresent(port, Port.AVAILABLE_ATTRIBUTES, Port.CREATED, Port.UPDATED, Port.AUTHENTICATION_PROVIDER,
-                    Port.BINDING_ADDRESS, Port.TCP_NO_DELAY, Port.SEND_BUFFER_SIZE, Port.RECEIVE_BUFFER_SIZE,
-                    Port.NEED_CLIENT_AUTH, Port.WANT_CLIENT_AUTH, Port.KEY_STORE, Port.TRUST_STORES);
+            assertAttributesPresent(port,
+                                    Attribute.getAttributeNames(Port.class),
+                                    ConfiguredObject.TYPE,
+                                    ConfiguredObject.CREATED_BY,
+                                    ConfiguredObject.CREATED_TIME,
+                                    ConfiguredObject.LAST_UPDATED_BY,
+                                    ConfiguredObject.LAST_UPDATED_TIME,
+                                    ConfiguredObject.DESCRIPTION,
+                                    Port.AUTHENTICATION_PROVIDER,
+                                    Port.BINDING_ADDRESS,
+                                    Port.TCP_NO_DELAY,
+                                    Port.SEND_BUFFER_SIZE,
+                                    Port.RECEIVE_BUFFER_SIZE,
+                                    Port.NEED_CLIENT_AUTH,
+                                    Port.WANT_CLIENT_AUTH,
+                                    Port.KEY_STORE,
+                                    Port.TRUST_STORES);
         }
 
         @SuppressWarnings("unchecked")
         Collection<String> transports = (Collection<String>) port.get(Port.TRANSPORTS);
         assertEquals("Unexpected value of attribute " + Port.TRANSPORTS, new HashSet<String>(Arrays.asList("TCP")),
-                new HashSet<String>(transports));
+                     new HashSet<String>(transports));
     }
 
     public static void assertDurableExchange(String exchangeName, String type, Map<String, Object> exchangeData)
@@ -223,42 +306,59 @@ public class Asserts
         assertExchange(exchangeName, type, exchangeData);
 
         assertEquals("Unexpected value of exchange attribute " + Exchange.DURABLE, Boolean.TRUE,
-                exchangeData.get(Exchange.DURABLE));
+                     exchangeData.get(Exchange.DURABLE));
     }
 
     public static void assertExchange(String exchangeName, String type, Map<String, Object> exchangeData)
     {
         assertNotNull("Exchange " + exchangeName + " is not found!", exchangeData);
-        assertAttributesPresent(exchangeData, Exchange.AVAILABLE_ATTRIBUTES, Exchange.CREATED, Exchange.UPDATED,
-                Exchange.ALTERNATE_EXCHANGE, Exchange.TIME_TO_LIVE);
+        assertAttributesPresent(exchangeData, Attribute.getAttributeNames(Exchange.class),
+                                Exchange.ALTERNATE_EXCHANGE, Exchange.TIME_TO_LIVE,
+                                ConfiguredObject.CREATED_BY,
+                                ConfiguredObject.CREATED_TIME,
+                                ConfiguredObject.LAST_UPDATED_BY,
+                                ConfiguredObject.LAST_UPDATED_TIME,
+                                ConfiguredObject.DESCRIPTION);
 
         assertEquals("Unexpected value of exchange attribute " + Exchange.NAME, exchangeName,
-                exchangeData.get(Exchange.NAME));
+                     exchangeData.get(Exchange.NAME));
         assertNotNull("Unexpected value of exchange attribute " + Exchange.ID, exchangeData.get(VirtualHost.ID));
         assertEquals("Unexpected value of exchange attribute " + Exchange.STATE, State.ACTIVE.name(),
-                exchangeData.get(Exchange.STATE));
+                     exchangeData.get(Exchange.STATE));
 
-        assertEquals("Unexpected value of exchange attribute " + Exchange.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
-                exchangeData.get(Exchange.LIFETIME_POLICY));
+        assertEquals("Unexpected value of exchange attribute " + Exchange.LIFETIME_POLICY,
+                     LifetimePolicy.PERMANENT.name(),
+                     exchangeData.get(Exchange.LIFETIME_POLICY));
         assertEquals("Unexpected value of exchange attribute " + Exchange.TYPE, type, exchangeData.get(Exchange.TYPE));
         assertNotNull("Unexpected value of exchange attribute statistics", exchangeData.get(STATISTICS_ATTRIBUTE));
 
         @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,
+                                Exchange.AVAILABLE_STATISTICS,
+                                Exchange.STATE_CHANGED,
+                                Exchange.PRODUCER_COUNT);
     }
 
     public static void assertBinding(String bindingName, String queueName, String exchange, Map<String, Object> binding)
     {
         assertNotNull("Binding map should not be null", binding);
-        assertAttributesPresent(binding, Binding.AVAILABLE_ATTRIBUTES, Binding.STATE, Binding.TIME_TO_LIVE,
-                Binding.CREATED, Binding.UPDATED);
+        assertAttributesPresent(binding,
+                                Attribute.getAttributeNames(Binding.class),
+                                Binding.STATE,
+                                Binding.TIME_TO_LIVE,
+                                ConfiguredObject.TYPE,
+                                ConfiguredObject.CREATED_BY,
+                                ConfiguredObject.CREATED_TIME,
+                                ConfiguredObject.LAST_UPDATED_BY,
+                                ConfiguredObject.LAST_UPDATED_TIME,
+                                ConfiguredObject.DESCRIPTION);
 
         assertEquals("Unexpected binding attribute " + Binding.NAME, bindingName, binding.get(Binding.NAME));
         assertEquals("Unexpected binding attribute " + Binding.QUEUE, queueName, binding.get(Binding.QUEUE));
         assertEquals("Unexpected binding attribute " + Binding.EXCHANGE, exchange, binding.get(Binding.EXCHANGE));
         assertEquals("Unexpected binding attribute " + Binding.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
-                binding.get(Binding.LIFETIME_POLICY));
+                     binding.get(Binding.LIFETIME_POLICY));
     }
 
     public static void assertBinding(String queueName, String exchange, Map<String, Object> binding)
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 bb01d1facf..e73e8767ac 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,7 +27,9 @@ 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;
@@ -302,9 +304,9 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase
 
     private void assertProvider(boolean managesPrincipals, String type, Map<String, Object> provider)
     {
-        Asserts.assertAttributesPresent(provider, AuthenticationProvider.AVAILABLE_ATTRIBUTES,
-                AuthenticationProvider.CREATED, AuthenticationProvider.UPDATED, AuthenticationProvider.DESCRIPTION,
-                AuthenticationProvider.TIME_TO_LIVE);
+        Asserts.assertAttributesPresent(provider, Attribute.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(),
                 provider.get(AuthenticationProvider.STATE));
         assertEquals("Unexpected value of provider attribute " + AuthenticationProvider.LIFETIME_POLICY,
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 18370185e5..07c1e7c8b8 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,7 +29,9 @@ 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;
@@ -62,7 +64,13 @@ public class BrokerRestHttpsTest extends QpidRestTestCase
     {
         Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
 
-        Asserts.assertAttributesPresent(brokerDetails, Broker.AVAILABLE_ATTRIBUTES, Broker.BYTES_RETAINED,
-                Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED);
+        Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class), Broker.BYTES_RETAINED,
+                Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE,
+                ConfiguredObject.TYPE,
+                ConfiguredObject.CREATED_BY,
+                ConfiguredObject.CREATED_TIME,
+                ConfiguredObject.LAST_UPDATED_BY,
+                ConfiguredObject.LAST_UPDATED_TIME,
+                ConfiguredObject.DESCRIPTION);
     }
 }
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 30a9ea2f21..76b4e7eefb 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,7 +34,9 @@ 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;
@@ -232,9 +234,15 @@ public class BrokerRestTest extends QpidRestTestCase
 
     protected void assertBrokerAttributes(Map<String, Object> brokerDetails)
     {
-        Asserts.assertAttributesPresent(brokerDetails, Broker.AVAILABLE_ATTRIBUTES,
+        Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
                 Broker.BYTES_RETAINED, Broker.PROCESS_PID,
-                Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED);
+                Broker.TIME_TO_LIVE,
+                ConfiguredObject.TYPE,
+                ConfiguredObject.CREATED_BY,
+                ConfiguredObject.CREATED_TIME,
+                ConfiguredObject.LAST_UPDATED_BY,
+                ConfiguredObject.LAST_UPDATED_TIME,
+                ConfiguredObject.DESCRIPTION);
 
         assertEquals("Unexpected value of attribute " + Broker.BUILD_VERSION, QpidProperties.getBuildVersion(),
                 brokerDetails.get(Broker.BUILD_VERSION));
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 d558e07ed7..cecf4b2ab5 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,6 +33,8 @@ 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;
 
@@ -172,7 +174,15 @@ public class ConnectionRestTest extends QpidRestTestCase
     private void assertSession(Map<String, Object> sessionData, AMQSession<?, ?> session)
     {
         assertNotNull("Session map cannot be null", sessionData);
-        Asserts.assertAttributesPresent(sessionData, Session.AVAILABLE_ATTRIBUTES, Session.STATE, Session.DURABLE,
+        Asserts.assertAttributesPresent(sessionData, Attribute.getAttributeNames(Session.class),
+                                        ConfiguredObject.TYPE,
+                                        ConfiguredObject.CREATED_BY,
+                                        ConfiguredObject.CREATED_TIME,
+                                        ConfiguredObject.LAST_UPDATED_BY,
+                                        ConfiguredObject.LAST_UPDATED_TIME,
+                                        ConfiguredObject.DESCRIPTION,
+                                        Session.STATE,
+                                        Session.DURABLE,
                 Session.LIFETIME_POLICY, Session.TIME_TO_LIVE, Session.CREATED, Session.UPDATED);
         assertEquals("Unexpecte value of attribute " + Session.NAME, session.getChannelId() + "",
                 sessionData.get(Session.NAME));
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 d09d5a8d02..85d8d31758 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,6 +29,8 @@ 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;
@@ -320,9 +322,14 @@ public class GroupProviderRestTest extends QpidRestTestCase
 
     private void assertProvider(String name, String type, Map<String, Object> provider)
     {
-        Asserts.assertAttributesPresent(provider, GroupProvider.AVAILABLE_ATTRIBUTES,
-                GroupProvider.CREATED, GroupProvider.UPDATED, GroupProvider.DESCRIPTION,
-                GroupProvider.TIME_TO_LIVE);
+        Asserts.assertAttributesPresent(provider, Attribute.getAttributeNames(GroupProvider.class),
+                GroupProvider.TIME_TO_LIVE,
+                ConfiguredObject.TYPE,
+                ConfiguredObject.CREATED_BY,
+                ConfiguredObject.CREATED_TIME,
+                ConfiguredObject.LAST_UPDATED_BY,
+                ConfiguredObject.LAST_UPDATED_TIME,
+                ConfiguredObject.DESCRIPTION);
         assertEquals("Unexpected value of provider attribute " + GroupProvider.STATE, State.ACTIVE.name(),
                 provider.get(GroupProvider.STATE));
         assertEquals("Unexpected value of provider attribute " + GroupProvider.LIFETIME_POLICY,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
index c38d9bb396..f825ffbb0f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
@@ -258,7 +258,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
         assertEquals("unexpected (dummy) password of default systests key store",
                 AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK, keystore.get(KeyStore.PASSWORD));
         assertEquals("unexpected type of default systests key store",
-                java.security.KeyStore.getDefaultType(), keystore.get(KeyStore.TYPE));
+                java.security.KeyStore.getDefaultType(), keystore.get(KeyStore.KEY_STORE_TYPE));
         assertEquals("unexpected certificateAlias value",
                 certAlias, keystore.get(KeyStore.CERTIFICATE_ALIAS));
         if(certAlias == null)
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 7f604bada7..9a657b0019 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,7 +28,9 @@ 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;
@@ -161,8 +163,13 @@ public class PreferencesProviderRestTest extends QpidRestTestCase
 
     public void assertProviderCommonAttributes(Map<String, Object> provider)
     {
-        Asserts.assertAttributesPresent(provider, PreferencesProvider.AVAILABLE_ATTRIBUTES, PreferencesProvider.CREATED,
-                PreferencesProvider.UPDATED, PreferencesProvider.TIME_TO_LIVE);
+        Asserts.assertAttributesPresent(provider,
+                                        Attribute.getAttributeNames(PreferencesProvider.class),
+                                        ConfiguredObject.CREATED_BY,
+                                        ConfiguredObject.CREATED_TIME,
+                                        ConfiguredObject.LAST_UPDATED_BY,
+                                        ConfiguredObject.LAST_UPDATED_TIME,
+                                        ConfiguredObject.DESCRIPTION, PreferencesProvider.TIME_TO_LIVE);
         assertEquals("Unexpected value of provider attribute " + PreferencesProvider.STATE, State.ACTIVE.name(),
                 provider.get(PreferencesProvider.STATE));
         assertEquals("Unexpected value of provider attribute " + PreferencesProvider.LIFETIME_POLICY,
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 3833af3ca5..a95c0a082f 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,7 +34,9 @@ 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;
@@ -209,9 +211,16 @@ public class QueueRestTest extends QpidRestTestCase
     private void assertConsumer(Map<String, Object> consumer)
     {
         assertNotNull("Consumer map should not be null", consumer);
-        Asserts.assertAttributesPresent(consumer, Consumer.AVAILABLE_ATTRIBUTES, Consumer.STATE, Consumer.TIME_TO_LIVE,
-                Consumer.CREATED, Consumer.UPDATED, Consumer.SETTLEMENT_MODE, Consumer.EXCLUSIVE, Consumer.SELECTOR,
-                Consumer.NO_LOCAL);
+        Asserts.assertAttributesPresent(consumer,
+                                        Attribute.getAttributeNames(Consumer.class), Consumer.STATE, Consumer.TIME_TO_LIVE,
+                Consumer.SETTLEMENT_MODE, Consumer.EXCLUSIVE, Consumer.SELECTOR,
+                Consumer.NO_LOCAL,
+                ConfiguredObject.TYPE,
+                ConfiguredObject.CREATED_BY,
+                ConfiguredObject.CREATED_TIME,
+                ConfiguredObject.LAST_UPDATED_BY,
+                ConfiguredObject.LAST_UPDATED_TIME,
+                ConfiguredObject.DESCRIPTION);
 
         assertEquals("Unexpected binding attribute " + Consumer.NAME, "1", consumer.get(Consumer.NAME));
         assertEquals("Unexpected binding attribute " + Consumer.DURABLE, Boolean.FALSE, consumer.get(Consumer.DURABLE));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
index 8b788780d6..7927bff07f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
@@ -26,7 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpid.server.model.KeyStore;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.TrustStore;
@@ -255,7 +254,7 @@ public class TrustStoreRestTest extends QpidRestTestCase
         assertEquals("unexpected (dummy) password of default systests trust store",
                 AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK, truststore.get(TrustStore.PASSWORD));
         assertEquals("unexpected type of default systests trust store",
-                java.security.KeyStore.getDefaultType(), truststore.get(TrustStore.TYPE));
+                java.security.KeyStore.getDefaultType(), truststore.get(TrustStore.TRUST_STORE_TYPE));
         assertEquals("unexpected peersOnly value",
                 peersOnly, truststore.get(TrustStore.PEERS_ONLY));
     }