Remove Plugin.isConfigured Only configured plugins should be created

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

5 files changed, 71 insertions, 68 deletions

diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
index 98fc198cc8..69e3218bf5 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
+++ b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
@@ -60,8 +60,16 @@ public class AccessControl extends AbstractPlugin
 
         public AccessControl newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
+            AccessControlConfiguration configuration = config.getConfiguration(AccessControlConfiguration.class);
+
+            // If there is no configuration for this plugin then don't load it.
+            if (configuration == null)
+            {
+                return null;
+            }
+
             AccessControl plugin = new AccessControl();
-            plugin.configure(config);
+            plugin.configure(configuration);
             return plugin;
         }
     };
@@ -109,14 +117,12 @@ public class AccessControl extends AbstractPlugin
 
     public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
-        _config = config.getConfiguration(AccessControlConfiguration.class);        
+        super.configure(config);
+
         AccessControlConfiguration accessConfig = (AccessControlConfiguration) _config;
-            
-        if (isConfigured())
-        {
-            String fileName = accessConfig.getFileName();
-            File aclFile = new File(fileName);
-            parseFile(aclFile);
-        }
+
+        String fileName = accessConfig.getFileName();
+        File aclFile = new File(fileName);
+        parseFile(aclFile);
     }
 }
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
index 9dd0ec47ec..6b5be4a9e2 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
@@ -57,7 +57,7 @@ class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
     }
 
     public void configure(ConfigurationPlugin config) throws ConfigurationException
-    {
+    {        
         _config = config.getConfiguration(SlowConsumerDetectionConfiguration.class);
         
         if (_config == null)
@@ -144,13 +144,4 @@ class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
         return false;
     }
 
-    public boolean isConfigured()
-    {
-        return _config != null && _virtualhost != null;
-    }
-
-    public void configure() throws ConfigurationException
-    {
-        // Empty
-    }
 }
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
index 05ff75f138..5262042b17 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
@@ -46,7 +46,7 @@ public class TopicDeletePolicy implements SlowConsumerPolicyPlugin
         {
             TopicDeletePolicyConfiguration config =
                     configuration.getConfiguration(TopicDeletePolicyConfiguration.class);
-            
+
             TopicDeletePolicy policy = new TopicDeletePolicy();
             policy.configure(config);
             return policy;
@@ -128,11 +128,6 @@ public class TopicDeletePolicy implements SlowConsumerPolicyPlugin
         return false;
     }
 
-    public boolean isConfigured()
-    {
-        return _configuration != null;
-    }
-
     public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
         _configuration = (TopicDeletePolicyConfiguration) config;
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java b/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
index 6c5ecf1d92..d91ee69ce2 100644
--- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
+++ b/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
@@ -43,8 +43,16 @@ public class Firewall extends AbstractPlugin
     {
         public Firewall newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
+            FirewallConfiguration configuration = config.getConfiguration(FirewallConfiguration.class);
+
+            // If there is no configuration for this plugin then don't load it.
+            if (configuration == null)
+            {
+                return null;
+            }
+            
             Firewall plugin = new Firewall();
-            plugin.configure(config);
+            plugin.configure(configuration);
             return plugin;
         }
         
@@ -121,43 +129,41 @@ public class Firewall extends AbstractPlugin
 
     public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
-        _config = config.getConfiguration(FirewallConfiguration.class);
+        super.configure(config);
         FirewallConfiguration firewallConfiguration = (FirewallConfiguration) _config;
-        
-        if (isConfigured())
+
+        // Get default action
+        String defaultAction = firewallConfiguration.getConfiguration().getString("[@default-action]");
+        if (defaultAction == null)
         {
-            // Get default action
-            String defaultAction = firewallConfiguration.getConfiguration().getString("[@default-action]");
-            if (defaultAction == null)
-            {
-                _default = Result.ABSTAIN;
-            }
-            else if (defaultAction.equalsIgnoreCase(FirewallRule.ALLOW))
-            {
-                _default = Result.ALLOWED;
-            }
-            else
-            {
-                _default = Result.DENIED;
-            }
-            
-            CompositeConfiguration finalConfig = new CompositeConfiguration(firewallConfiguration.getConfiguration());
-            List subFiles = firewallConfiguration.getConfiguration().getList("xml[@fileName]");
-            for (Object subFile : subFiles)
-            {
-                finalConfig.addConfiguration(new XMLConfiguration((String) subFile));
-            }
-    
-            // all rules must have an access attribute
-            int numRules = finalConfig.getList("rule[@access]").size();
-            _rules = new FirewallRule[numRules];
-            for (int i = 0; i < numRules; i++)
-            {
-                FirewallRule rule = new FirewallRule(finalConfig.getString("rule(" + i + ")[@access]"),
-    												 finalConfig.getList("rule(" + i + ")[@network]"),
-    												 finalConfig.getList("rule(" + i + ")[@hostname]"));
-                _rules[i] = rule;
-            }
+            _default = Result.ABSTAIN;
+        }
+        else if (defaultAction.equalsIgnoreCase(FirewallRule.ALLOW))
+        {
+            _default = Result.ALLOWED;
+        }
+        else
+        {
+            _default = Result.DENIED;
         }
+
+        CompositeConfiguration finalConfig = new CompositeConfiguration(firewallConfiguration.getConfiguration());
+        List subFiles = firewallConfiguration.getConfiguration().getList("xml[@fileName]");
+        for (Object subFile : subFiles)
+        {
+            finalConfig.addConfiguration(new XMLConfiguration((String) subFile));
+        }
+
+        // all rules must have an access attribute
+        int numRules = finalConfig.getList("rule[@access]").size();
+        _rules = new FirewallRule[numRules];
+        for (int i = 0; i < numRules; i++)
+        {
+            FirewallRule rule = new FirewallRule(finalConfig.getString("rule(" + i + ")[@access]"),
+                                                 finalConfig.getList("rule(" + i + ")[@network]"),
+                                                 finalConfig.getList("rule(" + i + ")[@hostname]"));
+            _rules[i] = rule;
+        }
+
     }
 }
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
index 26a5c132f9..8c38c6e76c 100644
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
+++ b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
@@ -52,8 +52,16 @@ public class SimpleXML extends AbstractPlugin
     {
         public SimpleXML newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
+            SimpleXMLConfiguration configuration = config.getConfiguration(SimpleXMLConfiguration.class);
+
+            // If there is no configuration for this plugin then don't load it.
+            if (configuration == null)
+            {
+                return null;
+            }
+
             SimpleXML plugin = new SimpleXML();
-            plugin.configure(config);
+            plugin.configure(configuration);
             return plugin;
         }
 
@@ -70,16 +78,13 @@ public class SimpleXML extends AbstractPlugin
 
     public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
-        _config = config.getConfiguration(SimpleXMLConfiguration.class);
+        super.configure(config);
 
         SimpleXMLConfiguration configuration = (SimpleXMLConfiguration) _config;
         
-        if (isConfigured())
-        {
-            _users = new ConcurrentHashMap<String, PrincipalPermissions>();
+        _users = new ConcurrentHashMap<String, PrincipalPermissions>();
 
-            processConfig(configuration.getConfiguration());
-        }
+        processConfig(configuration.getConfiguration());
     }
 
     private void processConfig(Configuration config)