QPID-6009 : [Java Broker] Add valid value meta data for attributes

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

2 files changed, 18 insertions, 0 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
index c84eb3200b..35eff5c0b7 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -52,8 +53,12 @@ public class MetaDataServlet extends AbstractServlet
         super.init();
 
         _instance = BrokerModel.getInstance();
+
+
     }
 
+
+
     @Override
     protected void doGetWithSubjectAndActor(final HttpServletRequest request, final HttpServletResponse response)
             throws ServletException, IOException
@@ -124,6 +129,18 @@ public class MetaDataServlet extends AbstractServlet
                 {
                     attrDetails.put("mandatory",((ConfiguredAutomatedAttribute)attribute).isMandatory());
                 }
+                if(!(((ConfiguredAutomatedAttribute)attribute).validValues()).isEmpty())
+                {
+                    Collection<String> validValues = ((ConfiguredAutomatedAttribute<?,?>) attribute).validValues();
+
+                    Collection<Object> convertedValues = new ArrayList<>(validValues.size());
+                    for(String value : validValues)
+                    {
+                        convertedValues.add(attribute.convert(value,null));
+                    }
+                    attrDetails.put("validValues", convertedValues);
+                }
+
             }
             if(attribute.isSecure())
             {
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 10f56cef58..61061e6209 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
@@ -32,6 +32,7 @@ import java.util.Set;
 import javax.management.JMException;
 
 import org.apache.log4j.Logger;
+
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.jmx.mbeans.LoggingManagementMBean;
 import org.apache.qpid.server.jmx.mbeans.ServerInformationMBean;