svn commit: r1775781 [2/2] - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/virtualhostn...

[rg...@apache.org]

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java Fri Dec 23 00:56:57 2016
@@ -80,7 +80,7 @@ public class LegacyAccessControlAdapterT
         when(vh.getCategoryClass()).thenReturn(VirtualHost.class);
         when(vh.getName()).thenReturn(TEST_VIRTUAL_HOST);
         when(vh.getAttribute(VirtualHost.NAME)).thenReturn(TEST_VIRTUAL_HOST);
-        when(vh.getParent(VirtualHostNode.class)).thenReturn(_virtualHostNode);
+        when(vh.getParent()).thenReturn(_virtualHostNode);
         when(vh.getModel()).thenReturn(BrokerModel.getInstance());
         return vh;
     }
@@ -91,7 +91,7 @@ public class LegacyAccessControlAdapterT
         when(vhn.getCategoryClass()).thenReturn(VirtualHostNode.class);
         when(vhn.getName()).thenReturn("testVHN");
         when(vhn.getAttribute(ConfiguredObject.NAME)).thenReturn("testVHN");
-        when(vhn.getParent(Broker.class)).thenReturn(_broker);
+        when(vhn.getParent()).thenReturn(_broker);
         when(vhn.getModel()).thenReturn(BrokerModel.getInstance());
         return vhn;
     }
@@ -100,7 +100,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreateAccessControlProvider()
     {
         AccessControlProvider accessControlProvider = mock(AccessControlProvider.class);
-        when(accessControlProvider.getParent(Broker.class)).thenReturn(_broker);
+        when(accessControlProvider.getParent()).thenReturn(_broker);
         when(accessControlProvider.getName()).thenReturn("TEST");
         when(accessControlProvider.getCategoryClass()).thenReturn(AccessControlProvider.class);
 
@@ -110,7 +110,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreateConsumer()
     {
         Queue queue = mock(Queue.class);
-        when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost);
+        when(queue.getParent()).thenReturn(_virtualHost);
         when(queue.getAttribute(Queue.NAME)).thenReturn(TEST_QUEUE);
         when(queue.getAttribute(Queue.DURABLE)).thenReturn(true);
         when(queue.getAttribute(Queue.LIFETIME_POLICY)).thenReturn(LifetimePolicy.PERMANENT);
@@ -123,7 +123,7 @@ public class LegacyAccessControlAdapterT
 
         QueueConsumer consumer = mock(QueueConsumer.class);
         when(consumer.getAttribute(QueueConsumer.NAME)).thenReturn("1");
-        when(consumer.getParent(Queue.class)).thenReturn(queue);
+        when(consumer.getParent()).thenReturn(queue);
         when(consumer.getCategoryClass()).thenReturn(Consumer.class);
 
         ObjectProperties properties = new ObjectProperties();
@@ -143,7 +143,7 @@ public class LegacyAccessControlAdapterT
         Port mock = mock(Port.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(Port.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildUpdateAuthorization(mock);
     }
 
@@ -155,7 +155,7 @@ public class LegacyAccessControlAdapterT
         User mock = mock(User.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(User.class);
-        when(mock.getParent(AuthenticationProvider.class)).thenReturn(authenticationProvider);
+        when(mock.getParent()).thenReturn(authenticationProvider);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertUpdateAuthorization(mock, LegacyOperation.UPDATE, ObjectType.USER, properties, authenticationProvider);
     }
@@ -169,7 +169,7 @@ public class LegacyAccessControlAdapterT
         when(mock.getName()).thenReturn("test");
         when(mock.getAttribute(ConfiguredObject.NAME)).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(VirtualHost.class);
-        when(mock.getParent(VirtualHostNode.class)).thenReturn(vhn);
+        when(mock.getParent()).thenReturn(vhn);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertDeleteAuthorization(mock, LegacyOperation.DELETE, ObjectType.VIRTUALHOST, properties, vhn);
     }
@@ -179,7 +179,7 @@ public class LegacyAccessControlAdapterT
         KeyStore mock = mock(KeyStore.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(KeyStore.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildDeleteAuthorization(mock);
     }
 
@@ -188,7 +188,7 @@ public class LegacyAccessControlAdapterT
         TrustStore mock = mock(TrustStore.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(TrustStore.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildDeleteAuthorization(mock);
     }
 
@@ -200,7 +200,7 @@ public class LegacyAccessControlAdapterT
         Group mock = mock(Group.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(Group.class);
-        when(mock.getParent(GroupProvider.class)).thenReturn(groupProvider);
+        when(mock.getParent()).thenReturn(groupProvider);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertDeleteAuthorization(mock, LegacyOperation.DELETE, ObjectType.GROUP, properties, groupProvider);
     }
@@ -213,7 +213,7 @@ public class LegacyAccessControlAdapterT
         GroupMember mock = mock(GroupMember.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(GroupMember.class);
-        when(mock.getParent(Group.class)).thenReturn(group);
+        when(mock.getParent()).thenReturn(group);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertDeleteAuthorization(mock, LegacyOperation.UPDATE, ObjectType.GROUP, properties, group);
     }
@@ -226,7 +226,7 @@ public class LegacyAccessControlAdapterT
         User mock = mock(User.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(User.class);
-        when(mock.getParent(AuthenticationProvider.class)).thenReturn(authenticationProvider);
+        when(mock.getParent()).thenReturn(authenticationProvider);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertDeleteAuthorization(mock, LegacyOperation.DELETE, ObjectType.USER, properties, authenticationProvider);
     }
@@ -242,7 +242,7 @@ public class LegacyAccessControlAdapterT
         when(exchange.getAttribute(Exchange.DURABLE)).thenReturn(false);
         when(exchange.getAttribute(Exchange.TYPE)).thenReturn(TEST_EXCHANGE_TYPE);
         when(exchange.getCategoryClass()).thenReturn(Exchange.class);
-        when(exchange.getParent(VirtualHost.class)).thenReturn(vh);
+        when(exchange.getParent()).thenReturn(vh);
 
         assertCreateAuthorization(exchange, LegacyOperation.CREATE, ObjectType.EXCHANGE, expectedProperties, vh);
     }
@@ -261,7 +261,7 @@ public class LegacyAccessControlAdapterT
         when(queue.getAttribute(Queue.DURABLE)).thenReturn(false);
         when(queue.getAttribute(Queue.ALTERNATE_EXCHANGE)).thenReturn(null);
         when(queue.getCategoryClass()).thenReturn(Queue.class);
-        when(queue.getParent(VirtualHost.class)).thenReturn(vh);
+        when(queue.getParent()).thenReturn(vh);
 
         assertCreateAuthorization(queue, LegacyOperation.CREATE, ObjectType.QUEUE, expectedProperties, vh);
     }
@@ -277,7 +277,7 @@ public class LegacyAccessControlAdapterT
         when(queueObject.getAttribute(Queue.OWNER)).thenReturn(null);
         when(queueObject.getAttribute(Queue.EXCLUSIVE)).thenReturn(ExclusivityPolicy.NONE);
         when(queueObject.getAttribute(Queue.DURABLE)).thenReturn(false);
-        when(queueObject.getParent(VirtualHost.class)).thenReturn(vh);
+        when(queueObject.getParent()).thenReturn(vh);
         when(queueObject.getCategoryClass()).thenReturn(Queue.class);
 
         assertDeleteAuthorization(queueObject, LegacyOperation.DELETE, ObjectType.QUEUE, expectedProperties, vh);
@@ -294,7 +294,7 @@ public class LegacyAccessControlAdapterT
         when(queueObject.getAttribute(Queue.OWNER)).thenReturn(null);
         when(queueObject.getAttribute(Queue.EXCLUSIVE)).thenReturn(ExclusivityPolicy.NONE);
         when(queueObject.getAttribute(Queue.DURABLE)).thenReturn(false);
-        when(queueObject.getParent(VirtualHost.class)).thenReturn(vh);
+        when(queueObject.getParent()).thenReturn(vh);
         when(queueObject.getCategoryClass()).thenReturn(Queue.class);
 
         assertUpdateAuthorization(queueObject, LegacyOperation.UPDATE, ObjectType.QUEUE, expectedProperties, vh);
@@ -310,7 +310,7 @@ public class LegacyAccessControlAdapterT
         when(exchange.getAttribute(Exchange.LIFETIME_POLICY)).thenReturn(LifetimePolicy.DELETE_ON_CONNECTION_CLOSE);
         when(exchange.getAttribute(Exchange.DURABLE)).thenReturn(false);
         when(exchange.getAttribute(Exchange.TYPE)).thenReturn(TEST_EXCHANGE_TYPE);
-        when(exchange.getParent(VirtualHost.class)).thenReturn(vh);
+        when(exchange.getParent()).thenReturn(vh);
         when(exchange.getCategoryClass()).thenReturn(Exchange.class);
 
         assertUpdateAuthorization(exchange, LegacyOperation.UPDATE, ObjectType.EXCHANGE, expectedProperties, vh);
@@ -327,7 +327,7 @@ public class LegacyAccessControlAdapterT
         when(exchange.getAttribute(Exchange.LIFETIME_POLICY)).thenReturn(LifetimePolicy.DELETE_ON_CONNECTION_CLOSE);
         when(exchange.getAttribute(Exchange.DURABLE)).thenReturn(false);
         when(exchange.getAttribute(Exchange.TYPE)).thenReturn(TEST_EXCHANGE_TYPE);
-        when(exchange.getParent(VirtualHost.class)).thenReturn(vh);
+        when(exchange.getParent()).thenReturn(vh);
         when(exchange.getCategoryClass()).thenReturn(Exchange.class);
 
         assertDeleteAuthorization(exchange, LegacyOperation.DELETE, ObjectType.EXCHANGE, expectedProperties, vh);
@@ -342,7 +342,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreatePort()
     {
         Port port = mock(Port.class);
-        when(port.getParent(Broker.class)).thenReturn(_broker);
+        when(port.getParent()).thenReturn(_broker);
         when(port.getName()).thenReturn("TEST");
         when(port.getCategoryClass()).thenReturn(Port.class);
 
@@ -352,7 +352,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreateAuthenticationProvider()
     {
         AuthenticationProvider authenticationProvider = mock(AuthenticationProvider.class);
-        when(authenticationProvider.getParent(Broker.class)).thenReturn(_broker);
+        when(authenticationProvider.getParent()).thenReturn(_broker);
         when(authenticationProvider.getName()).thenReturn("TEST");
         when(authenticationProvider.getCategoryClass()).thenReturn(AuthenticationProvider.class);
 
@@ -362,7 +362,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreateGroupProvider()
     {
         GroupProvider groupProvider = mock(GroupProvider.class);
-        when(groupProvider.getParent(Broker.class)).thenReturn(_broker);
+        when(groupProvider.getParent()).thenReturn(_broker);
         when(groupProvider.getName()).thenReturn("TEST");
         when(groupProvider.getCategoryClass()).thenReturn(GroupProvider.class);
 
@@ -373,7 +373,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreateKeyStore()
     {
         KeyStore keyStore = mock(KeyStore.class);
-        when(keyStore.getParent(Broker.class)).thenReturn(_broker);
+        when(keyStore.getParent()).thenReturn(_broker);
         when(keyStore.getName()).thenReturn("TEST");
         when(keyStore.getCategoryClass()).thenReturn(KeyStore.class);
 
@@ -383,7 +383,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseCreateTrustStore()
     {
         TrustStore trustStore = mock(TrustStore.class);
-        when(trustStore.getParent(Broker.class)).thenReturn(_broker);
+        when(trustStore.getParent()).thenReturn(_broker);
         when(trustStore.getName()).thenReturn("TEST");
         when(trustStore.getCategoryClass()).thenReturn(TrustStore.class);
 
@@ -400,7 +400,7 @@ public class LegacyAccessControlAdapterT
 
         Group group = mock(Group.class);
         when(group.getCategoryClass()).thenReturn(Group.class);
-        when(group.getParent(GroupProvider.class)).thenReturn(groupProvider);
+        when(group.getParent()).thenReturn(groupProvider);
         when(group.getAttribute(Group.NAME)).thenReturn("test");
         when(group.getName()).thenReturn("test");
 
@@ -417,7 +417,7 @@ public class LegacyAccessControlAdapterT
 
         GroupMember groupMember = mock(GroupMember.class);
         when(groupMember.getCategoryClass()).thenReturn(GroupMember.class);
-        when(groupMember.getParent(Group.class)).thenReturn(group);
+        when(groupMember.getParent()).thenReturn(group);
         when(groupMember.getAttribute(Group.NAME)).thenReturn("test");
         when(groupMember.getName()).thenReturn("test");
 
@@ -435,7 +435,7 @@ public class LegacyAccessControlAdapterT
         when(user.getCategoryClass()).thenReturn(User.class);
         when(user.getAttribute(User.NAME)).thenReturn("test");
         when(user.getName()).thenReturn("test");
-        when(user.getParent(AuthenticationProvider.class)).thenReturn(authenticationProvider);
+        when(user.getParent()).thenReturn(authenticationProvider);
         when(user.getModel()).thenReturn(BrokerModel.getInstance());
 
         assertCreateAuthorization(user, LegacyOperation.CREATE, ObjectType.USER, new ObjectProperties("test"), authenticationProvider);
@@ -459,7 +459,7 @@ public class LegacyAccessControlAdapterT
         AuthenticationProvider mock = mock(AuthenticationProvider.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(AuthenticationProvider.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildUpdateAuthorization(mock);
     }
 
@@ -468,7 +468,7 @@ public class LegacyAccessControlAdapterT
         GroupProvider mock = mock(GroupProvider.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(GroupProvider.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildUpdateAuthorization(mock);
     }
 
@@ -477,7 +477,7 @@ public class LegacyAccessControlAdapterT
         AccessControlProvider mock = mock(AccessControlProvider.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(AccessControlProvider.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildUpdateAuthorization(mock);
     }
 
@@ -486,7 +486,7 @@ public class LegacyAccessControlAdapterT
         KeyStore mock = mock(KeyStore.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(KeyStore.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildUpdateAuthorization(mock);
     }
 
@@ -495,7 +495,7 @@ public class LegacyAccessControlAdapterT
         TrustStore mock = mock(TrustStore.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(TrustStore.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildUpdateAuthorization(mock);
     }
 
@@ -507,7 +507,7 @@ public class LegacyAccessControlAdapterT
         Group mock = mock(Group.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(Group.class);
-        when(mock.getParent(GroupProvider.class)).thenReturn(groupProvider);
+        when(mock.getParent()).thenReturn(groupProvider);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertUpdateAuthorization(mock, LegacyOperation.UPDATE, ObjectType.GROUP, properties, groupProvider);
     }
@@ -520,7 +520,7 @@ public class LegacyAccessControlAdapterT
         GroupMember mock = mock(GroupMember.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(GroupMember.class);
-        when(mock.getParent(Group.class)).thenReturn(group);
+        when(mock.getParent()).thenReturn(group);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertUpdateAuthorization(mock, LegacyOperation.UPDATE, ObjectType.GROUP, properties, group);
     }
@@ -533,7 +533,7 @@ public class LegacyAccessControlAdapterT
         when(mock.getName()).thenReturn("test");
         when(mock.getAttribute(ConfiguredObject.NAME)).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(VirtualHost.class);
-        when(mock.getParent(VirtualHostNode.class)).thenReturn(vhn);
+        when(mock.getParent()).thenReturn(vhn);
         ObjectProperties properties = new ObjectProperties((String)mock.getName());
         assertUpdateAuthorization(mock, LegacyOperation.UPDATE, ObjectType.VIRTUALHOST, properties, vhn);
     }
@@ -549,7 +549,7 @@ public class LegacyAccessControlAdapterT
         Port mock = mock(Port.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(Port.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildDeleteAuthorization(mock);
     }
 
@@ -558,7 +558,7 @@ public class LegacyAccessControlAdapterT
         AuthenticationProvider mock = mock(AuthenticationProvider.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(AuthenticationProvider.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildDeleteAuthorization(mock);
     }
 
@@ -567,7 +567,7 @@ public class LegacyAccessControlAdapterT
         GroupProvider mock = mock(GroupProvider.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(GroupProvider.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildDeleteAuthorization(mock);
     }
 
@@ -576,7 +576,7 @@ public class LegacyAccessControlAdapterT
         AccessControlProvider mock = mock(AccessControlProvider.class);
         when(mock.getName()).thenReturn("test");
         when(mock.getCategoryClass()).thenReturn(AccessControlProvider.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildDeleteAuthorization(mock);
     }
 
@@ -585,7 +585,7 @@ public class LegacyAccessControlAdapterT
         BrokerLogger mock = mock(BrokerLogger.class);
         when(mock.getName()).thenReturn("TEST");
         when(mock.getCategoryClass()).thenReturn(BrokerLogger.class);
-        when(mock.getParent(Broker.class)).thenReturn(_broker);
+        when(mock.getParent()).thenReturn(_broker);
         assertBrokerChildCreateAuthorization(mock);
 
         when(mock.getName()).thenReturn("test");
@@ -598,12 +598,12 @@ public class LegacyAccessControlAdapterT
         BrokerLogger bl = mock(BrokerLogger.class);
         when(bl.getName()).thenReturn("LOGGER");
         when(bl.getCategoryClass()).thenReturn(BrokerLogger.class);
-        when(bl.getParent(Broker.class)).thenReturn(_broker);
+        when(bl.getParent()).thenReturn(_broker);
 
         BrokerLogInclusionRule mock = mock(BrokerLogInclusionRule.class);
         when(mock.getName()).thenReturn("TEST");
         when(mock.getCategoryClass()).thenReturn(BrokerLogInclusionRule.class);
-        when(mock.getParent(BrokerLogger.class)).thenReturn(bl);
+        when(mock.getParent()).thenReturn(bl);
         when(mock.getModel()).thenReturn(BrokerModel.getInstance());
         assertBrokerChildCreateAuthorization(mock, bl);
 
@@ -617,10 +617,10 @@ public class LegacyAccessControlAdapterT
     {
         ObjectProperties properties = new ObjectProperties(TEST_VIRTUAL_HOST);
 
-        VirtualHostLogger<?> mock = mock(VirtualHostLogger.class);
+        VirtualHostLogger mock = mock(VirtualHostLogger.class);
         when(mock.getName()).thenReturn("TEST");
         doReturn(VirtualHostLogger.class).when(mock).getCategoryClass();
-        when(mock.getParent(VirtualHost.class)).thenReturn(_virtualHost);
+        when(mock.getParent()).thenReturn(_virtualHost);
         when(mock.getModel()).thenReturn(BrokerModel.getInstance());
 
         assertCreateAuthorization(mock, LegacyOperation.CREATE, ObjectType.VIRTUALHOST, properties, _virtualHost);
@@ -635,16 +635,16 @@ public class LegacyAccessControlAdapterT
     {
         ObjectProperties properties = new ObjectProperties(TEST_VIRTUAL_HOST);
 
-        VirtualHostLogger<?> vhl = mock(VirtualHostLogger.class);
+        VirtualHostLogger vhl = mock(VirtualHostLogger.class);
         when(vhl.getName()).thenReturn("LOGGER");
         doReturn(VirtualHostLogger.class).when(vhl).getCategoryClass();
-        when(vhl.getParent(VirtualHost.class)).thenReturn(_virtualHost);
+        when(vhl.getParent()).thenReturn(_virtualHost);
         when(vhl.getModel()).thenReturn(BrokerModel.getInstance());
 
-        VirtualHostLogInclusionRule<?> mock = mock(VirtualHostLogInclusionRule.class);
+        VirtualHostLogInclusionRule mock = mock(VirtualHostLogInclusionRule.class);
         when(mock.getName()).thenReturn("TEST");
         doReturn(VirtualHostLogInclusionRule.class).when(mock).getCategoryClass();
-        when(mock.getParent(VirtualHostLogger.class)).thenReturn(vhl);
+        when(mock.getParent()).thenReturn(vhl);
         when(mock.getModel()).thenReturn(BrokerModel.getInstance());
 
         assertCreateAuthorization(mock, LegacyOperation.CREATE, ObjectType.VIRTUALHOST, properties, vhl);
@@ -658,7 +658,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthorisePurge()
     {
         Queue queue = mock(Queue.class);
-        when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost);
+        when(queue.getParent()).thenReturn(_virtualHost);
         when(queue.getAttribute(Queue.NAME)).thenReturn(TEST_QUEUE);
         when(queue.getCategoryClass()).thenReturn(Queue.class);
         when(queue.getAttribute(Queue.DURABLE)).thenReturn(false);
@@ -688,7 +688,7 @@ public class LegacyAccessControlAdapterT
     {
         ConfiguredObject logger = mock(VirtualHostLogger.class);
         when(logger.getCategoryClass()).thenReturn(VirtualHostLogger.class);
-        when(logger.getParent(eq(VirtualHost.class))).thenReturn(_virtualHost);
+        when(logger.getParent()).thenReturn(_virtualHost);
 
         _adapter.authoriseMethod(logger, "getFile", Collections.singletonMap("fileName", (Object)"qpid.log"));
         ObjectProperties expectedObjectProperties = new ObjectProperties(_virtualHost.getName());
@@ -704,7 +704,7 @@ public class LegacyAccessControlAdapterT
         properties.put(ObjectProperties.Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST);
 
         Queue queue = mock(Queue.class);
-        when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost);
+        when(queue.getParent()).thenReturn(_virtualHost);
         when(queue.getVirtualHost()).thenReturn(_virtualHost);
 
         when(queue.getAttribute(Queue.NAME)).thenReturn(TEST_QUEUE);
@@ -719,7 +719,7 @@ public class LegacyAccessControlAdapterT
     public void testAuthoriseUserOperation()
     {
         AuthenticationProvider authenticationProvider = mock(AuthenticationProvider.class);
-        when(authenticationProvider.getParent(Broker.class)).thenReturn(_broker);
+        when(authenticationProvider.getParent()).thenReturn(_broker);
         when(authenticationProvider.getAttribute(Queue.NAME)).thenReturn("test");
         when(authenticationProvider.getCategoryClass()).thenReturn(AuthenticationProvider.class);
 

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java Fri Dec 23 00:56:57 2016
@@ -98,7 +98,7 @@ public class AMQPConnection_0_8Test exte
         Model model = BrokerModel.getInstance();
 
         _broker = mock(Broker.class);
-        when(_broker.getParent(SystemConfig.class)).thenReturn(systemConfig);
+        when(_broker.getParent()).thenReturn(systemConfig);
         when(_broker.getModel()).thenReturn(model);
         when(_broker.getCategoryClass()).thenReturn(Broker.class);
         when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
@@ -107,7 +107,7 @@ public class AMQPConnection_0_8Test exte
         when(_broker.getContextValue(eq(Long.class), eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0l);
 
         _virtualHostNode = mock(VirtualHostNode.class);
-        when(_virtualHostNode.getParent(Broker.class)).thenReturn(_broker);
+        when(_virtualHostNode.getParent()).thenReturn(_broker);
         when(_virtualHostNode.getModel()).thenReturn(model);
         when(_virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class);
         when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
@@ -115,7 +115,7 @@ public class AMQPConnection_0_8Test exte
 
         _virtualHost = mock(QueueManagingVirtualHost.class);
         VirtualHostPrincipal virtualHostPrincipal = new VirtualHostPrincipal(_virtualHost);
-        when(_virtualHost.getParent(VirtualHostNode.class)).thenReturn(_virtualHostNode);
+        when(_virtualHost.getParent()).thenReturn(_virtualHostNode);
         when(_virtualHost.getModel()).thenReturn(model);
         when(_virtualHost.getCategoryClass()).thenReturn(VirtualHost.class);
         when(_virtualHost.getState()).thenReturn(State.ACTIVE);
@@ -142,7 +142,7 @@ public class AMQPConnection_0_8Test exte
         when(authenticationProvider.getSubjectCreator(false)).thenReturn(subjectCreator);
 
         _port = mock(AmqpPort.class);
-        when(_port.getParent(Broker.class)).thenReturn(_broker);
+        when(_port.getParent()).thenReturn(_broker);
         when(_port.getCategoryClass()).thenReturn(Port.class);
         when(_port.getChildExecutor()).thenReturn(_taskExecutor);
         when(_port.getModel()).thenReturn(model);

Modified: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java Fri Dec 23 00:56:57 2016
@@ -73,7 +73,7 @@ public class BrokerFileLoggerTest extend
         _broker = mock(Broker.class);
         when(_broker.getModel()).thenReturn(model);
         when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
-        when(_broker.getParent(SystemConfig.class)).thenReturn(systemConfig);
+        when(_broker.getParent()).thenReturn(systemConfig);
         doReturn(Broker.class).when(_broker).getCategoryClass();
 
         _baseFolder = new File(TMP_FOLDER, "test-sub-folder");

Modified: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java Fri Dec 23 00:56:57 2016
@@ -66,7 +66,7 @@ public class BrokerNameAndLevelLogInclus
         _brokerLogger = mock(BrokerLogger.class);
         when(_brokerLogger.getModel()).thenReturn(model);
         when(_brokerLogger.getChildExecutor()).thenReturn(_taskExecutor);
-        when(_brokerLogger.getParent(Broker.class)).thenReturn(_broker);
+        when(_brokerLogger.getParent()).thenReturn((Broker)_broker);
         doReturn(BrokerLogger.class).when(_brokerLogger).getCategoryClass();
    }
 

Modified: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java Fri Dec 23 00:56:57 2016
@@ -91,13 +91,13 @@ public class VirtualHostLoggerTest  exte
                                                                                  accessControlMock);
         when(broker.getModel()).thenReturn(model);
         when(broker.getChildExecutor()).thenReturn(_taskExecutor);
-        when(broker.getParent(SystemConfig.class)).thenReturn(systemConfig);
+        when(broker.getParent()).thenReturn(systemConfig);
         doReturn(Broker.class).when(broker).getCategoryClass();
 
         VirtualHostNode node =  BrokerTestHelper.mockWithSystemPrincipalAndAccessControl(VirtualHostNode.class, systemPrincipal, accessControlMock);
         when(node.getModel()).thenReturn(model);
         when(node.getChildExecutor()).thenReturn(_taskExecutor);
-        when(node.getParent(Broker.class)).thenReturn(broker);
+        when(node.getParent()).thenReturn(broker);
         when(node.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
         doReturn(VirtualHostNode.class).when(node).getCategoryClass();
         when(node.createPreferenceStore()).thenReturn(mock(PreferenceStore.class));

Modified: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java Fri Dec 23 00:56:57 2016
@@ -52,7 +52,7 @@ public class VirtualHostNameAndLevelLogI
 {
     private VirtualHostLogger _virtualHostLogger;
     private TaskExecutor _taskExecutor;
-    private final VirtualHost<?> _virtualhost = mock(VirtualHost.class);
+    private final VirtualHost _virtualhost = mock(VirtualHost.class);
 
     @Override
     public void setUp() throws Exception
@@ -72,17 +72,17 @@ public class VirtualHostNameAndLevelLogI
         VirtualHostNode<?> node =  mock(VirtualHostNode.class);
         when(node.getModel()).thenReturn(model);
         when(node.getChildExecutor()).thenReturn(_taskExecutor);
-        when(node.getParent(Broker.class)).thenReturn(broker);
+        when(node.getParent()).thenReturn(broker);
         doReturn(VirtualHostNode.class).when(node).getCategoryClass();
 
         when(_virtualhost.getModel()).thenReturn(model);
-        when(_virtualhost.getParent(VirtualHostNode.class)).thenReturn(node);
+        when(_virtualhost.getParent()).thenReturn(node);
         doReturn(VirtualHost.class).when(_virtualhost).getCategoryClass();
 
         _virtualHostLogger = mock(VirtualHostLogger.class);
         when(_virtualHostLogger.getModel()).thenReturn(model);
         when(_virtualHostLogger.getChildExecutor()).thenReturn(_taskExecutor);
-        when(_virtualHostLogger.getParent(VirtualHost.class)).thenReturn(_virtualhost);
+        when(_virtualHostLogger.getParent()).thenReturn(_virtualhost);
         doReturn(VirtualHostLogger.class).when(_virtualHostLogger).getCategoryClass();
     }
 

Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Fri Dec 23 00:56:57 2016
@@ -606,7 +606,7 @@ class ManagementNode implements MessageS
                     String attributeName = parentType.getSimpleName().toLowerCase();
                     final Object parentValue = attributes.remove(attributeName);
                     if (parentValue != null && !String.valueOf(parentValue)
-                                                      .equals(object.getParent(parentType).getName()))
+                                                      .equals(object.getParent().getName()))
                     {
                         return createFailureResponse(message,
                                                      STATUS_CODE_FORBIDDEN,

Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java Fri Dec 23 00:56:57 2016
@@ -119,7 +119,7 @@ class ManagementOutputConverter
 
             if (parentType != _managementNode.getManagedObject().getCategoryClass())
             {
-                attributes.put(parentType.getSimpleName().toLowerCase(), object.getParent(parentType));
+                attributes.put(parentType.getSimpleName().toLowerCase(), object.getParent());
             }
 
         }

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java Fri Dec 23 00:56:57 2016
@@ -204,7 +204,7 @@ public class OAuth2InteractiveAuthentica
 
                     private void authoriseManagement(final Subject subject)
                     {
-                        Broker broker = (Broker) oauth2Provider.getParent(Broker.class);
+                        Broker broker = (Broker) oauth2Provider.getParent();
                         HttpManagementUtil.assertManagementAccess(broker, subject);
                     }
                 };

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/QueueReport.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/QueueReport.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/QueueReport.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/QueueReport.java Fri Dec 23 00:56:57 2016
@@ -107,7 +107,7 @@ public abstract class QueueReport<T>
      */
     public final String getVirtualHostName()
     {
-        return _queue.getParent(VirtualHost.class).getName();
+        return _queue.getParent().getName();
     }
 
     /**

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java Fri Dec 23 00:56:57 2016
@@ -289,7 +289,7 @@ public class ConfiguredObjectExpressionF
             {
                 if(PARENT_ATTR.equals(_propertyName))
                 {
-                    return object.getParent(object.getModel().getParentType(object.getCategoryClass()));
+                    return object.getParent();
                 }
                 else
                 {

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Fri Dec 23 00:56:57 2016
@@ -199,15 +199,10 @@ public class ConfiguredObjectToMapConver
 
     private void collectInheritedActualContext(ConfiguredObject<?> confObject, Map<String, Object> contextValues)
     {
-        Model model = confObject.getModel();
-        Class<? extends ConfiguredObject> parentType = model.getParentType(confObject.getCategoryClass());
-        if(parentType != null)
+        ConfiguredObject parent = confObject.getParent();
+        if(parent != null)
         {
-            ConfiguredObject parent = confObject.getParent(parentType);
-            if(parent != null)
-            {
-                collectInheritedActualContext(parent, contextValues);
-            }
+            collectInheritedActualContext(parent, contextValues);
         }
         Object value = confObject.getActualAttributes().get(ConfiguredObject.CONTEXT);
         if (value instanceof Map)

Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java Fri Dec 23 00:56:57 2016
@@ -315,7 +315,7 @@ public class OAuth2InteractiveAuthentica
         when(authenticationProvider.getAuthorizationEndpointURI()).thenReturn(new URI(TEST_AUTHORIZATION_ENDPOINT));
         when(authenticationProvider.getClientId()).thenReturn(TEST_CLIENT_ID);
         when(authenticationProvider.getScope()).thenReturn(TEST_OAUTH2_SCOPE);
-        when(authenticationProvider.getParent(Broker.class)).thenReturn(mockBroker);
+        when(authenticationProvider.getParent()).thenReturn(mockBroker);
         when(authenticationProvider.getSubjectCreator(any(Boolean.class))).thenReturn(mockSubjectCreator);
         when(authenticationProvider.authenticateViaAuthorizationCode(TEST_VALID_AUTHORIZATION_CODE, TEST_REQUEST_HOST)).thenReturn(mockSuccessfulAuthenticationResult);
         when(authenticationProvider.authenticateViaAuthorizationCode(TEST_INVALID_AUTHORIZATION_CODE, TEST_REQUEST_HOST)).thenReturn(failedAuthenticationResult);

Modified: qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java (original)
+++ qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java Fri Dec 23 00:56:57 2016
@@ -95,7 +95,7 @@ class WebSocketProvider implements Accep
         _defaultSupportedProtocolReply = defaultSupportedProtocolReply;
 
         _factory = new MultiVersionProtocolEngineFactory(
-                        _port.getParent(Broker.class),
+                        (Broker<?>) _port.getParent(),
                         _supported,
                         _defaultSupportedProtocolReply,
                         _port,

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1775781&r1=1775780&r2=1775781&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Fri Dec 23 00:56:57 2016
@@ -167,7 +167,7 @@ public class VirtualHostMessageStoreTest
         {
             if (_virtualHost != null)
             {
-                VirtualHostNode<?> node = _virtualHost.getParent(VirtualHostNode.class);
+                VirtualHostNode<?> node = (VirtualHostNode<?>) _virtualHost.getParent();
                 node.close();
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org