QPID-2581 : Update Plugins to have a consistent configure(ConfigurationPlugin config) method.

Further work is required to ensure that all ConfigurationPlugins perform config validation rather than leaving that to the plugin.
The plugin should just use the config.

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

1 files changed, 5 insertions, 10 deletions

diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
index 75846b26ef..98fc198cc8 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
@@ -60,17 +60,12 @@ public class AccessControl extends AbstractPlugin
 
         public AccessControl newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            AccessControl plugin = new AccessControl(config);
-            plugin.configure();
+            AccessControl plugin = new AccessControl();
+            plugin.configure(config);
             return plugin;
         }
     };
-    
-    public AccessControl(ConfigurationPlugin config)
-    {
-        _config = config.getConfiguration(AccessControlConfiguration.class);
-    }
-    
+
     public Result getDefault()
     {
         return _ruleSet.getDefault();
@@ -112,9 +107,9 @@ public class AccessControl extends AbstractPlugin
         return _ruleSet.check(principal.getName(), operation, objectType, properties);
     }
 
-    @Override
-    public void configure() throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
+        _config = config.getConfiguration(AccessControlConfiguration.class);        
         AccessControlConfiguration accessConfig = (AccessControlConfiguration) _config;
             
         if (isConfigured())