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=1728497&r1=1728496&r2=1728497&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 Thu Feb 4 15:38:05 2016 @@ -42,6 +42,7 @@ import org.apache.qpid.server.model.Mode import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.StateTransition; import org.apache.qpid.server.model.testmodels.TestSecurityManager; +import org.apache.qpid.server.plugin.ConfiguredObjectAttributeInjector; import org.apache.qpid.server.plugin.ConfiguredObjectRegistration; import org.apache.qpid.server.security.SecurityManager; @@ -219,7 +220,9 @@ public class TestConfiguredObject extend return TestConfiguredObjectModel.class.getSimpleName(); } }; - _configuredObjectTypeRegistry = new ConfiguredObjectTypeRegistry(Arrays.asList(configuredObjectRegistration), CATEGORIES, + _configuredObjectTypeRegistry = new ConfiguredObjectTypeRegistry(Arrays.asList(configuredObjectRegistration), + Collections.<ConfiguredObjectAttributeInjector>emptySet(), + CATEGORIES, _configuredObjectFactory); }
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestModel.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestModel.java?rev=1728497&r1=1728496&r2=1728497&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestModel.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestModel.java Thu Feb 4 15:38:05 2016 @@ -27,6 +27,7 @@ import org.apache.qpid.server.model.Conf import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry; import org.apache.qpid.server.model.Model; +import org.apache.qpid.server.plugin.ConfiguredObjectAttributeInjector; import org.apache.qpid.server.plugin.ConfiguredObjectRegistration; public class TestModel extends Model @@ -62,7 +63,9 @@ public class TestModel extends Model return "org.apache.qpid.server.model.testmodels.attribute"; } }; - _registry = new ConfiguredObjectTypeRegistry(Arrays.asList(configuredObjectRegistration), getSupportedCategories(), _objectFactory); + _registry = new ConfiguredObjectTypeRegistry(Arrays.asList(configuredObjectRegistration), + Collections.<ConfiguredObjectAttributeInjector>emptySet(), + getSupportedCategories(), _objectFactory); } Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.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/ApiDocsServlet.java?rev=1728497&r1=1728496&r2=1728497&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java Thu Feb 4 15:38:05 2016 @@ -28,10 +28,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfiguredAutomatedAttribute; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectAttribute; import org.apache.qpid.server.model.ConfiguredObjectOperation; +import org.apache.qpid.server.model.ConfiguredSettableAttribute; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.OperationParameter; @@ -395,8 +395,8 @@ public class ApiDocsServlet extends Abst { final Class type = attribute.getType(); return renderType(type, - attribute instanceof ConfiguredAutomatedAttribute && ((ConfiguredAutomatedAttribute)attribute).hasValidValues() - ? ((ConfiguredAutomatedAttribute)attribute).validValues() : null); + attribute instanceof ConfiguredSettableAttribute && ((ConfiguredSettableAttribute)attribute).hasValidValues() + ? ((ConfiguredSettableAttribute)attribute).validValues() : null); } Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.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/MetaDataServlet.java?rev=1728497&r1=1728496&r2=1728497&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java Thu Feb 4 15:38:05 2016 @@ -39,12 +39,12 @@ import javax.servlet.http.HttpServletRes import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import org.apache.qpid.server.model.ConfiguredAutomatedAttribute; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectAttribute; import org.apache.qpid.server.model.ConfiguredObjectOperation; import org.apache.qpid.server.model.ConfiguredObjectStatistic; import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry; +import org.apache.qpid.server.model.ConfiguredSettableAttribute; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.OperationParameter; @@ -167,9 +167,9 @@ public class MetaDataServlet extends Abs { attrDetails.put("derived", attribute.isDerived()); } - if (attribute.isAutomated()) + if (!attribute.isDerived()) { - ConfiguredAutomatedAttribute automatedAttribute = (ConfiguredAutomatedAttribute) attribute; + ConfiguredSettableAttribute automatedAttribute = (ConfiguredSettableAttribute) attribute; if (!"".equals(automatedAttribute.defaultValue())) { attrDetails.put("defaultValue", automatedAttribute.defaultValue()); @@ -184,7 +184,7 @@ public class MetaDataServlet extends Abs } if (!(automatedAttribute.validValues()).isEmpty()) { - Collection<String> validValues = ((ConfiguredAutomatedAttribute<?, ?>) attribute).validValues(); + Collection<String> validValues = ((ConfiguredSettableAttribute<?, ?>) attribute).validValues(); Collection<Object> convertedValues = new ArrayList<>(validValues.size()); for (String value : validValues) 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=1728497&r1=1728496&r2=1728497&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 Thu Feb 4 15:38:05 2016 @@ -38,6 +38,7 @@ import java.util.Set; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectAttribute; +import org.apache.qpid.server.model.ConfiguredObjectMethodAttribute; import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry; import org.apache.qpid.server.model.Model; import org.apache.qpid.test.utils.QpidTestCase; @@ -229,7 +230,7 @@ public class ConfiguredObjectToMapConver ConfiguredObjectTypeRegistry typeRegistry = model.getTypeRegistry(); final Map<String, ConfiguredObjectAttribute<?, ?>> attributeTypes = typeRegistry.getAttributeTypes(TestChild.class); - final ConfiguredObjectAttribute longAttr = mock(ConfiguredObjectAttribute.class); + final ConfiguredObjectAttribute longAttr = mock(ConfiguredObjectMethodAttribute.class); when(longAttr.isOversized()).thenReturn(true); when(longAttr.getOversizedAltText()).thenReturn(""); when(attributeTypes.get(eq("longAttr"))).thenReturn(longAttr); @@ -310,7 +311,7 @@ public class ConfiguredObjectToMapConver Model model = createTestModel(); ConfiguredObjectTypeRegistry typeRegistry = model.getTypeRegistry(); Map<String, ConfiguredObjectAttribute<?, ?>> attributeTypes = typeRegistry.getAttributeTypes(TestChild.class); - ConfiguredObjectAttribute secureAttribute = mock(ConfiguredObjectAttribute.class); + ConfiguredObjectAttribute secureAttribute = mock(ConfiguredObjectMethodAttribute.class); when(secureAttribute.isSecure()).thenReturn(true); when(secureAttribute.isSecureValue(any())).thenReturn(true); when(attributeTypes.get(eq("secureAttribute"))).thenReturn(secureAttribute); @@ -391,7 +392,7 @@ public class ConfiguredObjectToMapConver when(model.getChildTypes(ConfiguredObject.class)).thenReturn(list); final ConfiguredObjectTypeRegistry typeRegistry = mock(ConfiguredObjectTypeRegistry.class); final Map<String, ConfiguredObjectAttribute<?, ?>> attrTypes = mock(Map.class); - when(attrTypes.get(any(String.class))).thenReturn(mock(ConfiguredObjectAttribute.class)); + when(attrTypes.get(any(String.class))).thenReturn(mock(ConfiguredObjectMethodAttribute.class)); when(typeRegistry.getAttributeTypes(any(Class.class))).thenReturn(attrTypes); when(model.getTypeRegistry()).thenReturn(typeRegistry); return model; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
