From db543bd85497285b1911c7250a9a1f76522f318b Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 2 May 2014 20:32:16 +0000 Subject: QPID-5746 : [Java Broker] Split attribute annotations into separate annotations for derived and automated, and allow derived attributes to be persisted git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592030 13f79535-47bb-0310-9956-ffa450edef68 --- .../access/plugins/ACLFileAccessControlProvider.java | 2 +- .../access/plugins/ACLFileAccessControlProviderImpl.java | 8 ++++---- .../server/virtualhostnode/jdbc/JDBCVirtualHostNode.java | 14 +++++++------- .../apache/qpid/server/management/amqp/ManagementNode.java | 2 +- .../qpid/server/management/plugin/HttpManagement.java | 2 +- .../management/plugin/HttpManagementConfiguration.java | 10 +++++----- .../server/management/plugin/servlet/rest/RestServlet.java | 2 +- .../rest/action/AbstractSpecialisedAttributeLister.java | 4 ++-- .../org/apache/qpid/server/jmx/JMXManagementPlugin.java | 2 +- .../apache/qpid/server/jmx/JMXManagementPluginImpl.java | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java index d54f226a00..b8509ebd39 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java @@ -27,6 +27,6 @@ import org.apache.qpid.server.model.ManagedObject; @ManagedObject( category = false, type="AclFile" ) public interface ACLFileAccessControlProvider> extends AccessControlProvider { - @ManagedAttribute( automate = true, mandatory = true, description = "File location" ) + @ManagedAttribute( mandatory = true, description = "File location" ) String getPath(); } diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index 554f2f46c5..91e64e5334 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -69,9 +69,9 @@ public class ACLFileAccessControlProviderImpl } @Override - public void validate() + public void onValidate() { - super.validate(); + super.onValidate(); if(!isDurable()) { throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable"); @@ -124,7 +124,7 @@ public class ACLFileAccessControlProviderImpl } @Override - public boolean setState(State currentState, State desiredState) + public boolean setState(State desiredState) throws IllegalStateTransitionException, AccessControlException { State state = _state.get(); @@ -186,7 +186,7 @@ public class ACLFileAccessControlProviderImpl } @Override - protected void authoriseSetDesiredState(State currentState, State desiredState) throws AccessControlException + protected void authoriseSetDesiredState(State desiredState) throws AccessControlException { if(desiredState == State.DELETED) { diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java index e6e4f960d8..f66cb74529 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java @@ -27,22 +27,22 @@ import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory; public interface JDBCVirtualHostNode { //TODO: Split this attribute into connectionUrl, username and password. Make the password attribute secure. - @ManagedAttribute(automate=true, mandatory=true) + @ManagedAttribute(mandatory=true) String getConnectionUrl(); - @ManagedAttribute(automate=true, defaultValue=DefaultConnectionProviderFactory.TYPE) + @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE) String getConnectionPoolType(); - @ManagedAttribute(automate=true) + @ManagedAttribute String getBigIntType(); - @ManagedAttribute(automate=true) + @ManagedAttribute boolean isBytesForBlob(); - @ManagedAttribute(automate=true) + @ManagedAttribute String getVarBinaryType(); - @ManagedAttribute(automate=true) + @ManagedAttribute String getBlobType(); -} \ No newline at end of file +} diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java index 8f43cdf9ef..ab58b80ac4 100644 --- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java +++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java @@ -496,7 +496,7 @@ class ManagementNode implements MessageSource, MessageDestination responseHeader.setHeader(TYPE_ATTRIBUTE, type); try { - entity.setDesiredState(entity.getState(),State.DELETED); + entity.setDesiredState(State.DELETED); responseHeader.setHeader(STATUS_CODE_HEADER, STATUS_CODE_NO_CONTENT); } catch(AccessControlException e) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 54c66647c0..c1b2fc4bd6 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -113,7 +113,7 @@ public class HttpManagement extends AbstractPluginAdapter implem } @Override - protected boolean setState(State currentState, State desiredState) + protected boolean setState(State desiredState) { if(desiredState == State.ACTIVE) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java index aebe76b9bd..c054ffe405 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java @@ -28,19 +28,19 @@ import org.apache.qpid.server.model.Plugin; public interface HttpManagementConfiguration> extends Plugin { - @ManagedAttribute( automate = true, defaultValue = "true" ) + @ManagedAttribute( defaultValue = "true" ) boolean isHttpsSaslAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "true" ) + @ManagedAttribute( defaultValue = "true" ) boolean isHttpSaslAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "true" ) + @ManagedAttribute( defaultValue = "true" ) boolean isHttpsBasicAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "false" ) + @ManagedAttribute( defaultValue = "false" ) boolean isHttpBasicAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "600" ) + @ManagedAttribute( defaultValue = "600" ) public int getSessionTimeout(); AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index 0309ecc838..4bd28accb0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java @@ -541,7 +541,7 @@ public class RestServlet extends AbstractServlet Collection> allObjects = getObjects(request); for(ConfiguredObject o : allObjects) { - o.setDesiredState(o.getState(), State.DELETED); + o.setDesiredState(State.DELETED); } response.setStatus(HttpServletResponse.SC_OK); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java index 173e4fce66..5d1e7cba21 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java @@ -59,9 +59,9 @@ abstract class AbstractSpecialisedAttributeLister i for(ConfiguredObjectAttribute attr : typeSpecificAttributes) { attributeNames.add(attr.getName()); - if(!"".equals(attr.getAnnotation().description())) + if(!"".equals(attr.getDescription())) { - descriptions.put(attr.getName(), attr.getAnnotation().description()); + descriptions.put(attr.getName(), attr.getDescription()); } } data.put(ATTRIBUTES, attributeNames); diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java index 472be5a1a1..36efd4cb4c 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java @@ -30,6 +30,6 @@ public interface JMXManagementPlugin> extends P String USE_PLATFORM_MBEAN_SERVER = "usePlatformMBeanServer"; String DEFAULT_USE_PLATFORM_MBEAN_SERVER = "true"; - @ManagedAttribute( automate = true, defaultValue = DEFAULT_USE_PLATFORM_MBEAN_SERVER ) + @ManagedAttribute( defaultValue = DEFAULT_USE_PLATFORM_MBEAN_SERVER ) boolean getUsePlatformMBeanServer(); } diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java index aa823d7f6a..850c14cf20 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java @@ -88,7 +88,7 @@ public class JMXManagementPluginImpl } @Override - protected boolean setState(State currentState, State desiredState) + protected boolean setState(State desiredState) { if(desiredState == State.ACTIVE) { -- cgit v1.2.1