QPID-1447 : Added improved toString to SCD components

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

4 files changed, 49 insertions, 13 deletions

diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
index 01ebab8122..8e2ecff6fb 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
 import java.util.Arrays;
 import java.util.List;
 
-public class    SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugin
+public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugin
 {
     public static class SlowConsumerDetectionPolicyConfigurationFactory implements ConfigurationPluginFactory
     {
@@ -67,4 +67,10 @@ public class    SlowConsumerDetectionPolicyConfiguration extends ConfigurationPl
             throw new ConfigurationException("No Slow consumer policy defined.");
         }
     }
+
+    @Override
+    public String formatToString()
+    {
+        return "Policy:"+getPolicyName();
+    }
 }
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
index 161a06ed7b..e825556e61 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
@@ -20,11 +20,6 @@
  */
 package org.apache.qpid.server.configuration.plugin;
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
@@ -34,6 +29,11 @@ import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPlugin;
 import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPluginFactory;
 
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
 {
     private SlowConsumerPolicyPlugin _policyPlugin;
@@ -92,7 +92,7 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
             !containsPositiveLong("messageCount"))
         {
             throw new ConfigurationException("At least one configuration property" +
-                                             "('messageAge','depth' or 'messageCount') must be specified.");             
+                                             "('messageAge','depth' or 'messageCount') must be specified.");
         }
 
         SlowConsumerDetectionPolicyConfiguration policyConfig = getConfiguration(SlowConsumerDetectionPolicyConfiguration.class.getName());
@@ -116,12 +116,6 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
                 _logger.debug("Policy Keys:" + key);
             }
 
-            _logger.debug("Configured SCDQC");
-            _logger.debug("Age:" + getMessageAge());
-            _logger.debug("Depth:" + getDepth());
-            _logger.debug("Count:" + getMessageCount());
-            _logger.debug("Policy:" + policyConfig.getPolicyName());
-            _logger.debug("Available factories:" + factories);
         }
 
         SlowConsumerPolicyPluginFactory<SlowConsumerPolicyPlugin> pluginFactory = factories.get(policyConfig.getPolicyName().toLowerCase());
@@ -132,5 +126,28 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
         }
 
         _policyPlugin = pluginFactory.newInstance(policyConfig);
+
+        // Debug the creation of this Config
+        _logger.debug(this);
+    }
+
+    public String formatToString()
+    {
+        StringBuilder sb = new StringBuilder();
+        if (getMessageAge() > 0)
+        {
+            sb.append("Age:").append(getMessageAge()).append(":");
+        }
+        if (getDepth() > 0)
+        {
+            sb.append("Depth:").append(getDepth()).append(":");
+        }
+        if (getMessageCount() > 0)
+        {
+            sb.append("Count:").append(getMessageCount()).append(":");
+        }
+
+        sb.append("Policy[").append(getPolicy()).append("]");
+        return sb.toString();
     }
 }
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 c5275aa0bf..3bd4ae8d4e 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
@@ -132,4 +132,10 @@ public class TopicDeletePolicy implements SlowConsumerPolicyPlugin
     {
         _configuration = (TopicDeletePolicyConfiguration) config;
     }
+
+    @Override
+    public String toString()
+    {
+        return "TopicDelete" + (_configuration == null ? "" : "[" + _configuration + "]");
+    }
 }
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
index baf71b638f..e6ad1cbcc3 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
@@ -71,4 +71,11 @@ public class TopicDeletePolicyConfiguration extends ConfigurationPlugin
         return (hasConfiguration() && contains("delete-persistent"));
     }
 
+    @Override
+    public String formatToString()
+    {
+        return (deletePersistent()?"delete-durable":"");
+    }
+
+
 }