Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java Fri Dec 23 10:42:25 2016 @@ -37,7 +37,7 @@ public class TestElecEngineImpl @ManagedObjectFactoryConstructor public TestElecEngineImpl(final Map<String, Object> attributes, TestCar<?> parent) { - super(parentsMap(parent), attributes); + super(parent, attributes); } @SuppressWarnings("unused")
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java Fri Dec 23 10:42:25 2016 @@ -32,6 +32,6 @@ public class TestHybridEngineImpl extend @ManagedObjectFactoryConstructor public TestHybridEngineImpl(final Map<String, Object> attributes, TestCar<?> parent) { - super(parentsMap(parent), attributes); + super(parent, attributes); } } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java Fri Dec 23 10:42:25 2016 @@ -51,7 +51,7 @@ public class TestKitCarImpl extends Abst @ManagedObjectFactoryConstructor public TestKitCarImpl(final Map<String, Object> attributes) { - super(parentsMap(), attributes, newTaskExecutor(), TestModel.getInstance()); + super(null, attributes, newTaskExecutor(), TestModel.getInstance()); } @Override Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java Fri Dec 23 10:42:25 2016 @@ -34,7 +34,7 @@ public class TestPetrolEngineImpl @ManagedObjectFactoryConstructor public TestPetrolEngineImpl(final Map<String, Object> attributes, TestCar<?> parent) { - super(parentsMap(parent), attributes); + super(parent, attributes); } } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java Fri Dec 23 10:42:25 2016 @@ -63,7 +63,7 @@ public class TestStandardCarImpl extends public TestStandardCarImpl(final Map<String, Object> attributes, Model model) { - super(parentsMap(), attributes, newTaskExecutor(), model); + super(null, attributes, newTaskExecutor(), model); _preferenceStore = new NoopPreferenceStoreFactoryService().createInstance(this, null); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java Fri Dec 23 10:42:25 2016 @@ -19,8 +19,6 @@ package org.apache.qpid.server.model.testmodels.lifecycle; -import static org.mockito.Mockito.mock; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -56,29 +54,19 @@ public class TestConfiguredObject extend private boolean _throwExceptionOnCreate; private boolean _throwExceptionOnValidate; - public final static Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> createParents(ConfiguredObject<?> parent) - { - return Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(parent.getCategoryClass(), parent); - } - public TestConfiguredObject(String name) { - this(name, mock(ConfiguredObject.class), CurrentThreadTaskExecutor.newStartedInstance()); + this(name, null, CurrentThreadTaskExecutor.newStartedInstance()); } public TestConfiguredObject(String name, ConfiguredObject<?> parent, TaskExecutor taskExecutor) { - this(createParents(parent), Collections.<String, Object>singletonMap(ConfiguredObject.NAME, name), taskExecutor, TestConfiguredObjectModel.INSTANCE); - } - - public TestConfiguredObject(ConfiguredObject<?> parent, Map<String, Object> attributes) - { - this(createParents(parent), attributes, parent.getTaskExecutor(), TestConfiguredObjectModel.INSTANCE); + this(parent, Collections.<String, Object>singletonMap(ConfiguredObject.NAME, name), taskExecutor, TestConfiguredObjectModel.INSTANCE); } - public TestConfiguredObject(Map parents, Map<String, Object> attributes, TaskExecutor taskExecutor, Model model) + public TestConfiguredObject(ConfiguredObject<?> parent, Map<String, Object> attributes, TaskExecutor taskExecutor, Model model) { - super(parents, attributes, taskExecutor, model); + super(parent, attributes, taskExecutor, model); _opened = false; } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java Fri Dec 23 10:42:25 2016 @@ -58,8 +58,8 @@ public class AbstractConfiguredObjectTes TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, Collections.<String, Object>singletonMap(ConfiguredObject.NAME, - objectName) - ); + objectName), + null); assertEquals(objectName, object.getName()); assertNull(object.getAutomatedNonPersistedValue()); @@ -102,7 +102,7 @@ public class AbstractConfiguredObjectTes Map<String, Object> attributes = Collections.<String, Object>singletonMap(TestSingleton.NAME, objectName); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals(TestSingleton.DEFAULTED_VALUE_DEFAULT, object1.getDefaultedValue()); @@ -117,7 +117,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.DEFAULTED_VALUE, "override"); TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object.getName()); assertEquals("override", object.getDefaultedValue()); @@ -133,7 +133,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.DEFAULTED_VALUE, "override"); TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object.getName()); assertEquals("override", object.getDefaultedValue()); @@ -148,8 +148,7 @@ public class AbstractConfiguredObjectTes TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, Collections.<String, Object>singletonMap(ConfiguredObject.NAME, - "testDefaultInitialization") - ); + "testDefaultInitialization"), null); assertEquals(object.getAttrWithDefaultFromContextNoInit(), TestSingleton.testGlobalDefault); assertEquals(object.getAttrWithDefaultFromContextCopyInit(), TestSingleton.testGlobalDefault); assertEquals(object.getAttrWithDefaultFromContextMaterializeInit(), TestSingleton.testGlobalDefault); @@ -163,8 +162,7 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, "testDefaultInitialization2"); attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(TestSingleton.TEST_CONTEXT_DEFAULT, "foo")); object = _model.getObjectFactory().create(TestSingleton.class, - attributes - ); + attributes, null); assertEquals("foo", object.getAttrWithDefaultFromContextNoInit()); assertEquals("foo", object.getAttrWithDefaultFromContextCopyInit()); assertEquals("foo", object.getAttrWithDefaultFromContextMaterializeInit()); @@ -177,8 +175,7 @@ public class AbstractConfiguredObjectTes setTestSystemProperty(TestSingleton.TEST_CONTEXT_DEFAULT, "bar"); object = _model.getObjectFactory().create(TestSingleton.class, Collections.<String, Object>singletonMap(ConfiguredObject.NAME, - "testDefaultInitialization3") - ); + "testDefaultInitialization3"), null); assertEquals("bar", object.getAttrWithDefaultFromContextNoInit()); assertEquals("bar", object.getAttrWithDefaultFromContextCopyInit()); @@ -199,7 +196,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.ENUM_VALUE, TestEnum.TEST_ENUM1.name()); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals(TestEnum.TEST_ENUM1, object1.getEnumValue()); @@ -214,7 +211,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.ENUM_VALUE, TestEnum.TEST_ENUM1); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals(TestEnum.TEST_ENUM1, object1.getEnumValue()); @@ -229,7 +226,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.INT_VALUE, "-4"); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals(-4, object1.getIntValue()); @@ -244,7 +241,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.INT_VALUE, 5); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals(5, object1.getIntValue()); @@ -258,7 +255,8 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.NAME, objectName); attributes.put(TestSingleton.INT_VALUE, 6.1); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertEquals(objectName, object.getName()); assertEquals(6, object.getIntValue()); @@ -273,7 +271,8 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.NAME, objectName); attributes.put(TestSingleton.DATE_VALUE, now); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertEquals(objectName, object.getName()); assertEquals(new Date(now), object.getDateValue()); @@ -288,7 +287,8 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.NAME, objectName); attributes.put(TestSingleton.DATE_VALUE, date); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertEquals(objectName, object.getName()); assertEquals(new Date(0), object.getDateValue()); @@ -308,7 +308,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.STRING_VALUE, contextToken); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals("myValue", object1.getStringValue()); @@ -317,7 +317,7 @@ public class AbstractConfiguredObjectTes System.setProperty(sysPropertyName, ""); TestSingleton object2 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals("", object2.getStringValue()); @@ -325,7 +325,7 @@ public class AbstractConfiguredObjectTes System.clearProperty(sysPropertyName); TestSingleton object3 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); // yields the unexpanded token - not sure if this is really useful behaviour? assertEquals(contextToken, object3.getStringValue()); @@ -349,7 +349,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.MAP_VALUE, contextToken); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertEquals(objectName, object1.getName()); assertEquals(expectedMap, object1.getMapValue()); @@ -370,7 +370,7 @@ public class AbstractConfiguredObjectTes attributes.put(TestSingleton.STRING_VALUE, contextToken); TestSingleton object1 = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); // Check the object's context itself assertTrue(object1.getContext().containsKey("myReplacement")); assertEquals("myValue", object1.getContext().get("myReplacement")); @@ -390,7 +390,8 @@ public class AbstractConfiguredObjectTes try { - _model.getObjectFactory().create(TestSingleton.class, attributes); + _model.getObjectFactory().create(TestSingleton.class, + attributes, null); fail("creation of child object should have failed due to invalid value"); } catch (IllegalArgumentException e) @@ -413,7 +414,7 @@ public class AbstractConfiguredObjectTes try { - _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes); + _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes, null); fail("Exception not thrown"); } catch (IllegalConfigurationException ice) @@ -425,7 +426,7 @@ public class AbstractConfiguredObjectTes legalCreateAttributes.put(ConfiguredObject.NAME, objectName); legalCreateAttributes.put(TestSingleton.VALID_VALUE, TestSingleton.VALID_VALUE1); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes, null); assertEquals(TestSingleton.VALID_VALUE1, object.getValidValue()); } @@ -438,7 +439,7 @@ public class AbstractConfiguredObjectTes try { - _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes); + _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes, null); fail("Exception not thrown"); } catch (IllegalConfigurationException ice) @@ -452,7 +453,7 @@ public class AbstractConfiguredObjectTes try { - _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes); + _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes, null); fail("Exception not thrown"); } catch (IllegalConfigurationException ice) @@ -466,7 +467,7 @@ public class AbstractConfiguredObjectTes legalCreateAttributes.put(TestSingleton.VALUE_WITH_PATTERN, "foozzzzzbar"); legalCreateAttributes.put(TestSingleton.LIST_VALUE_WITH_PATTERN, Arrays.asList("1.1.1.1", "255.255.255.255")); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes, null); assertEquals("foozzzzzbar", object.getValueWithPattern()); } @@ -478,7 +479,7 @@ public class AbstractConfiguredObjectTes legalCreateAttributes.put(ConfiguredObject.NAME, objectName); legalCreateAttributes.put(TestSingleton.VALID_VALUE, TestSingleton.VALID_VALUE1); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes, null); assertEquals(TestSingleton.VALID_VALUE1, object.getValidValue()); object.setAttributes(Collections.singletonMap(TestSingleton.VALID_VALUE, TestSingleton.VALID_VALUE2)); @@ -511,7 +512,7 @@ public class AbstractConfiguredObjectTes try { - _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes); + _model.getObjectFactory().create(TestSingleton.class, illegalCreateAttributes, null); fail("Exception not thrown"); } catch (IllegalConfigurationException ice) @@ -524,7 +525,7 @@ public class AbstractConfiguredObjectTes legalCreateAttributesEnums.put(TestSingleton.ENUMSET_VALUES, Arrays.asList(TestEnum.TEST_ENUM2, TestEnum.TEST_ENUM3)); - TestSingleton obj = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributesEnums); + TestSingleton obj = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributesEnums, null); assertTrue(obj.getEnumSetValues().containsAll(Arrays.asList(TestEnum.TEST_ENUM2, TestEnum.TEST_ENUM3))); } @@ -534,7 +535,7 @@ public class AbstractConfiguredObjectTes Arrays.asList(TestEnum.TEST_ENUM2.name(), TestEnum.TEST_ENUM3.name())); TestSingleton - obj = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributesStrings); + obj = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributesStrings, null); assertTrue(obj.getEnumSetValues().containsAll(Arrays.asList(TestEnum.TEST_ENUM2, TestEnum.TEST_ENUM3))); } } @@ -548,7 +549,7 @@ public class AbstractConfiguredObjectTes legalCreateAttributes.put(TestSingleton.VALUE_WITH_PATTERN, "foozzzzzbar"); legalCreateAttributes.put(TestSingleton.LIST_VALUE_WITH_PATTERN, Arrays.asList("1.1.1.1", "255.255.255.255")); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, legalCreateAttributes, null); assertEquals("foozzzzzbar", object.getValueWithPattern()); assertEquals(Arrays.asList("1.1.1.1", "255.255.255.255"), object.getListValueWithPattern()); @@ -603,7 +604,7 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, objectName); TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertTrue("context default not in contextKeys", @@ -625,7 +626,7 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, objectName); TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, - attributes); + attributes, null); assertTrue("context default not in contextKeys", object.getContextKeys(true).contains(TestSingleton.TEST_CONTEXT_DEFAULT_WITH_THISREF)); @@ -641,7 +642,8 @@ public class AbstractConfiguredObjectTes Map<String, Object> attributes = new HashMap<>(); attributes.put(ConfiguredObject.NAME, objectName); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertEquals(TestSingletonImpl.DERIVED_VALUE, object.getDerivedValue()); // Check that update is ignored @@ -659,7 +661,8 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, objectName); attributes.put(TestSingleton.SECURE_VALUE, secret); - final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertEquals(AbstractConfiguredObject.SECURED_STRING_VALUE, object.getAttribute(TestSingleton.SECURE_VALUE)); assertEquals(secret, object.getSecureValue()); @@ -686,7 +689,8 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, "myName"); attributes.put(TestSingleton.IMMUTABLE_VALUE, originalValue); - final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertEquals("Immutable value unexpectedly changed", originalValue, object.getImmutableValue()); @@ -723,7 +727,8 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, "myName"); attributes.put(TestSingleton.IMMUTABLE_VALUE, null); - final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); assertNull(object.getImmutableValue()); @@ -748,7 +753,8 @@ public class AbstractConfiguredObjectTes Map<String, Object> attributes = new HashMap<>(); attributes.put(ConfiguredObject.NAME, "myName"); - final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); UUID originalUuid = object.getId(); String originalType = object.getType(); @@ -785,7 +791,8 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, objectName); attributes.put(TestSingleton.STRING_VALUE, "first"); - final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); final AtomicInteger listenerCount = new AtomicInteger(); final LinkedHashMap<String, String> updates = new LinkedHashMap<>(); @@ -841,7 +848,8 @@ public class AbstractConfiguredObjectTes attributes.put(ConfiguredObject.NAME, getTestName()); attributes.put(TestSingleton.STRING_VALUE, "${foo1}"); - final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); final AtomicInteger listenerCount = new AtomicInteger(); object.addChangeListener(new AbstractConfigurationChangeListener() @@ -885,7 +893,8 @@ public class AbstractConfiguredObjectTes Map<String, Object> attributes = new HashMap<>(); attributes.put(TestSingleton.NAME, objectName); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); Date createdTime = object.getCreatedTime(); assertTrue("Create date not populated", createdTime.compareTo(now) >= 0); @@ -904,7 +913,8 @@ public class AbstractConfiguredObjectTes Map<String, Object> attributes = new HashMap<>(); attributes.put(TestSingleton.NAME, objectName); - TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes); + TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, + attributes, null); final Map<String, Object> stats = object.getStatistics(); assertEquals("Unexpected number of statistics", 1, stats.size()); @@ -930,7 +940,8 @@ public class AbstractConfiguredObjectTes @Override public TestSingleton run() { - return _model.getObjectFactory().create(TestSingleton.class, attributes); + return _model.getObjectFactory().create(TestSingleton.class, + attributes, null); } }); @@ -983,7 +994,8 @@ public class AbstractConfiguredObjectTes @Override public TestSingleton run() { - return _model.getObjectFactory().create(TestSingleton.class, attributes); + return _model.getObjectFactory().create(TestSingleton.class, + attributes, null); } }); @@ -1040,7 +1052,8 @@ public class AbstractConfiguredObjectTes public TestSingleton run() { return _model.getObjectFactory() - .create(TestSingleton.class, attributes); + .create(TestSingleton.class, + attributes, null); } }); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/PreferencesTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/PreferencesTest.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/PreferencesTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/PreferencesTest.java Fri Dec 23 10:42:25 2016 @@ -68,7 +68,7 @@ public class PreferencesTest extends Qpi final String objectName = getTestName(); _testObject = _model.getObjectFactory() .create(TestSingleton.class, - Collections.<String, Object>singletonMap(ConfiguredObject.NAME, objectName)); + Collections.<String, Object>singletonMap(ConfiguredObject.NAME, objectName), null); _preferenceTaskExecutor = new CurrentThreadTaskExecutor(); _preferenceTaskExecutor.start(); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java Fri Dec 23 10:42:25 2016 @@ -113,7 +113,7 @@ public class TestSingletonImpl extends A @ManagedObjectFactoryConstructor public TestSingletonImpl(final Map<String, Object> attributes) { - super(parentsMap(), attributes, newTaskExecutor(), TestModel.getInstance()); + super(null, attributes, newTaskExecutor(), TestModel.getInstance()); } private static CurrentThreadTaskExecutor newTaskExecutor() @@ -126,7 +126,7 @@ public class TestSingletonImpl extends A public TestSingletonImpl(final Map<String, Object> attributes, final TaskExecutor taskExecutor) { - super(parentsMap(), attributes, taskExecutor); + super(null, attributes, taskExecutor); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/PreferencesRecovererTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/PreferencesRecovererTest.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/PreferencesRecovererTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/PreferencesRecovererTest.java Fri Dec 23 10:42:25 2016 @@ -61,7 +61,7 @@ public class PreferencesRecovererTest ex _store = mock(PreferenceStore.class); _testObject = _model.getObjectFactory() .create(TestCar.class, - Collections.<String, Object>singletonMap(ConfiguredObject.NAME, getTestName())); + Collections.<String, Object>singletonMap(ConfiguredObject.NAME, getTestName()), null); _testChildObject = _testObject.createChild(TestEngine.class, Collections.<String, Object>singletonMap(ConfiguredObject.NAME, getTestName())); _testSubject = TestPrincipalUtils.createTestSubject(TEST_USERNAME); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/TestVirtualHostNodeFactory.java Fri Dec 23 10:42:25 2016 @@ -34,9 +34,9 @@ public class TestVirtualHostNodeFactory } @Override - public TestVirtualHostNode createInstance(Map<String, Object> attributes, ConfiguredObject<?>... parents) + public TestVirtualHostNode createInstance(Map<String, Object> attributes, ConfiguredObject<?> parent) { - Broker<?> broker = getParent(Broker.class, parents); + Broker<?> broker = (Broker<?>) parent; return new TestVirtualHostNode(broker, attributes); } Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java Fri Dec 23 10:42:25 2016 @@ -56,7 +56,7 @@ public abstract class AbstractLogger<X e protected AbstractLogger(Map<String, Object> attributes, ConfiguredObject<?> parent) { - super(parentsMap(parent), attributes); + super(parent, attributes); addChangeListener(new LogInclusionRuleListener()); } Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java Fri Dec 23 10:42:25 2016 @@ -44,10 +44,10 @@ public abstract class AbstractNameAndLev private LoggerNameAndLevelFilter _filter; - protected AbstractNameAndLevelLogInclusionRule(final Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parents, + protected AbstractNameAndLevelLogInclusionRule(final ConfiguredObject<?> parent, Map<String, Object> attributes) { - super(parents, attributes); + super(parent, attributes); } @Override Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractPredicateLogInclusionRule.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractPredicateLogInclusionRule.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractPredicateLogInclusionRule.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractPredicateLogInclusionRule.java Fri Dec 23 10:42:25 2016 @@ -44,10 +44,10 @@ public abstract class AbstractPredicateL private PredicateAndLoggerNameAndLevelFilter _filter; - protected AbstractPredicateLogInclusionRule(final Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parents, + protected AbstractPredicateLogInclusionRule(final ConfiguredObject<?> parent, Map<String, Object> attributes) { - super(parents, attributes); + super(parent, attributes); } @Override Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java Fri Dec 23 10:42:25 2016 @@ -35,7 +35,7 @@ public class BrokerNameAndLevelLogInclus @ManagedObjectFactoryConstructor protected BrokerNameAndLevelLogInclusionRuleImpl(final Map<String, Object> attributes, BrokerLogger<?> logger) { - super(parentsMap(logger), attributes); + super(logger, attributes); } @Override Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java Fri Dec 23 10:42:25 2016 @@ -47,7 +47,7 @@ class BrokerUserOrConnectionLogInclusion BrokerUserOrConnectionLogInclusionRuleImpl(final Map<String, Object> attributes, BrokerLogger<?> logger) { - super(parentsMap(logger), attributes); + super(logger, attributes); } @Override Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java Fri Dec 23 10:42:25 2016 @@ -35,7 +35,7 @@ public class VirtualHostNameAndLevelLogI @ManagedObjectFactoryConstructor protected VirtualHostNameAndLevelLogInclusionRuleImpl(final Map<String, Object> attributes, VirtualHostLogger<?> logger) { - super(parentsMap(logger), attributes); + super(logger, attributes); } @Override Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java Fri Dec 23 10:42:25 2016 @@ -47,7 +47,7 @@ class VirtualHostUserOrConnectionLogIncl protected VirtualHostUserOrConnectionLogInclusionRuleImpl(final Map<String, Object> attributes, BrokerLogger<?> logger) { - super(parentsMap(logger), attributes); + super(logger, attributes); } @Override Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1775810&r1=1775809&r2=1775810&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Fri Dec 23 10:42:25 2016 @@ -480,7 +480,7 @@ public class ConfiguredObjectToMapConver carContext.put(PARENT_CONTEXT_PROPERTY1_NAME, PARENT_CONTEXT_PROPERTY1_ACTUAL_VALUE); carContext.put(PARENT_CONTEXT_PROPERTY2_NAME, PARENT_CONTEXT_PROPERTY2_ACTUAL_VALUE); carAttributes.put(ConfiguredObject.CONTEXT, carContext); - TestCar car = model.getObjectFactory().create(TestCar.class, carAttributes); + TestCar car = model.getObjectFactory().create(TestCar.class, carAttributes, null); final Map<String, Object> engineAttributes = new HashMap<>(); engineAttributes.put(ConfiguredObject.NAME, "myEngine"); engineAttributes.put(ConfiguredObject.TYPE, TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
