You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/12/04 21:31:18 UTC
svn commit: r1772572 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/managem...
Author: kwall
Date: Sun Dec 4 21:31:17 2016
New Revision: 1772572
URL: http://svn.apache.org/viewvc?rev=1772572&view=rev
Log:
QPID-7571: [Java Broker] Rename new anontation mandatory to match that used by attributes
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedOperation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectMethodOperation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromAnnotation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromInjection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Param.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/apidocs.css
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Sun Dec 4 21:31:17 2016
@@ -174,7 +174,7 @@ public interface ConfiguredObject<X exte
@ManagedOperation(description = "Return the (selected) statistic values", nonModifying = true, changesConfiguredObjectState = false)
Map<String, Object> getStatistics(@Param(name = "statistics", defaultValue = "[]",
- description = "Option list of statistic values to retrieve") List<String> statistics);
+ description = "Optional list of statistic values to retrieve") List<String> statistics);
/**
* Get the names of attributes that are set on this object
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedOperation.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedOperation.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedOperation.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedOperation.java Sun Dec 4 21:31:17 2016
@@ -196,9 +196,9 @@ public class ConfiguredObjectInjectedOpe
{
providedVal = null;
}
- if (providedVal == null && !param.isNullable())
+ if (providedVal == null && param.isMandatory())
{
- throw new IllegalArgumentException(String.format("Parameter %s of operation %s in %s requires a non-null value",
+ throw new IllegalArgumentException(String.format("Parameter '%s' of operation %s in %s requires a non-null value",
param.getName(),
_operation.getName(),
_operation.getDeclaringClass().getSimpleName()));
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectMethodOperation.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectMethodOperation.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectMethodOperation.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectMethodOperation.java Sun Dec 4 21:31:17 2016
@@ -167,9 +167,9 @@ public class ConfiguredObjectMethodOpera
{
providedVal = null;
}
- if (providedVal == null && !param.isNullable())
+ if (providedVal == null && param.isMandatory())
{
- throw new IllegalArgumentException(String.format("Parameter %s of operation %s in %s requires a non-null value",
+ throw new IllegalArgumentException(String.format("Parameter '%s' of operation %s in %s requires a non-null value",
param.getName(),
_operation.getName(),
_objectType));
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameter.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameter.java Sun Dec 4 21:31:17 2016
@@ -39,5 +39,5 @@ public interface OperationParameter
boolean isCompatible(OperationParameter that);
- boolean isNullable();
+ boolean isMandatory();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromAnnotation.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromAnnotation.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromAnnotation.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromAnnotation.java Sun Dec 4 21:31:17 2016
@@ -75,9 +75,9 @@ public class OperationParameterFromAnnot
}
@Override
- public boolean isNullable()
+ public boolean isMandatory()
{
- return _param.nullable() && !_type.isPrimitive();
+ return _param.mandatory() || _type.isPrimitive();
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromInjection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromInjection.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromInjection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OperationParameterFromInjection.java Sun Dec 4 21:31:17 2016
@@ -33,7 +33,7 @@ public class OperationParameterFromInjec
private final String _defaultValue;
private final String _description;
private final List<String> _validValues;
- private final boolean _nullable;
+ private final boolean _mandatory;
public OperationParameterFromInjection(final String name,
final Class<?> type,
@@ -41,14 +41,14 @@ public class OperationParameterFromInjec
final String defaultValue,
final String description,
final String[] validValues,
- final boolean nullable)
+ final boolean mandatory)
{
_type = type;
_genericType = genericType;
_name = name;
_defaultValue = defaultValue;
_description = description;
- _nullable = nullable;
+ _mandatory = mandatory;
_validValues = validValues == null ? Collections.<String>emptyList() : Collections.unmodifiableList(Arrays.asList(validValues));
}
@@ -89,9 +89,9 @@ public class OperationParameterFromInjec
}
@Override
- public boolean isNullable()
+ public boolean isMandatory()
{
- return _nullable && !_type.isPrimitive();
+ return _mandatory || _type.isPrimitive();
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Param.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Param.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Param.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Param.java Sun Dec 4 21:31:17 2016
@@ -32,5 +32,5 @@ public @interface Param
String defaultValue() default "";
String description() default "";
String[] validValues() default {};
- boolean nullable() default true;
+ boolean mandatory() default false;
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java Sun Dec 4 21:31:17 2016
@@ -125,7 +125,7 @@ public class ConfiguredObjectTypeRegistr
}
}
- public void testOperationsRejectsNullParameter()
+ public void testOperationWithMandatoryParameter_RejectsNullParameter()
{
final String objectName = "testKitCar";
Map<String, Object> attributes = new HashMap<>();
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java Sun Dec 4 21:31:17 2016
@@ -40,6 +40,16 @@ import org.apache.qpid.test.utils.QpidTe
public class InjectedAttributeTest extends QpidTestCase
{
+ private static final InjectedAttributeStatisticOrOperation.TypeValidator TYPE_VALIDATOR =
+ new InjectedAttributeOrStatistic.TypeValidator()
+ {
+ @Override
+ public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
+ {
+ return TestCar.class.isAssignableFrom(type);
+ }
+ };
+
private static class TestInjector implements ConfiguredObjectAttributeInjector
{
@@ -104,16 +114,6 @@ public class InjectedAttributeTest exten
public void testInjectedSettableAttributeWithDefault()
{
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
-
final ConfiguredSettableInjectedAttribute<?, ?> attrInjector =
new ConfiguredSettableInjectedAttribute<TestCar<?>, Integer>("meaningOfLife",
Integer.class,
@@ -127,7 +127,7 @@ public class InjectedAttributeTest exten
"",
"",
null,
- "", validator, Initialization.none);
+ "", TYPE_VALIDATOR, Initialization.none);
TestModel model = new TestModel(null, new TestInjector(attrInjector));
@@ -151,17 +151,6 @@ public class InjectedAttributeTest exten
public void testInjectedSettableAttributeValidValues()
{
-
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
-
final ConfiguredSettableInjectedAttribute<?, ?> attrInjector =
new ConfiguredSettableInjectedAttribute<TestCar<?>, Integer>("meaningOfLife",
Integer.class,
@@ -175,7 +164,7 @@ public class InjectedAttributeTest exten
"",
"",
new String[] { "42", "49" },
- "", validator, Initialization.none);
+ "", TYPE_VALIDATOR, Initialization.none);
TestModel model = new TestModel(null, new TestInjector(attrInjector));
@@ -248,15 +237,6 @@ public class InjectedAttributeTest exten
public void testInjectedDerivedAttribute() throws Exception
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("getMeaningOfLife", TestCar.class);
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
final ConfiguredDerivedInjectedAttribute<?, ?> attrInjector =
new ConfiguredDerivedInjectedAttribute<TestCar<?>, Integer>("meaningOfLife",
@@ -267,7 +247,7 @@ public class InjectedAttributeTest exten
false,
"",
"",
- validator);
+ TYPE_VALIDATOR);
TestModel model = new TestModel(null, new TestInjector(attrInjector));
@@ -283,21 +263,12 @@ public class InjectedAttributeTest exten
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("getMeaningOfLife", TestCar.class);
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
final ConfiguredObjectInjectedStatistic<?, ?> statInjector =
new ConfiguredObjectInjectedStatistic<TestCar<?>, Integer>("meaningOfLife",
method,
null, "",
- validator,
+ TYPE_VALIDATOR,
StatisticUnit.COUNT,
StatisticType.POINT_IN_TIME,
"What is 6 x 9?");
@@ -316,21 +287,12 @@ public class InjectedAttributeTest exten
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("getWhatISent", TestCar.class, Integer.TYPE);
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
final ConfiguredObjectInjectedStatistic<?, ?> statInjector1 =
new ConfiguredObjectInjectedStatistic<TestCar<?>, Integer>("whatISent1",
method,
new Object[] { 1 }, "",
- validator,
+ TYPE_VALIDATOR,
StatisticUnit.COUNT,
StatisticType.POINT_IN_TIME,
"One");
@@ -338,7 +300,7 @@ public class InjectedAttributeTest exten
new ConfiguredObjectInjectedStatistic<TestCar<?>, Integer>("whatISent2",
method,
new Object[] { 2 }, "",
- validator,
+ TYPE_VALIDATOR,
StatisticUnit.COUNT,
StatisticType.POINT_IN_TIME,
"Two");
@@ -355,25 +317,15 @@ public class InjectedAttributeTest exten
public void testInjectedOperation() throws Exception
{
-
Method method = InjectedAttributeTest.class.getDeclaredMethod("fly", TestCar.class, Integer.TYPE);
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
final OperationParameter[] params = new OperationParameter[1];
params[0] = new OperationParameterFromInjection("height", Integer.TYPE, Integer.TYPE, "", "", new String[0],
- true);
+ false);
final ConfiguredObjectInjectedOperation<?> operationInjector =
new ConfiguredObjectInjectedOperation<TestCar<?>>("fly", "", true,
false,
- "", params, method, null, validator);
+ "", params, method, null, TYPE_VALIDATOR);
TestModel model = new TestModel(null, new TestInjector(operationInjector));
@@ -399,30 +351,23 @@ public class InjectedAttributeTest exten
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("saySomething", TestCar.class, String.class, Integer.TYPE);
- InjectedAttributeOrStatistic.TypeValidator validator =
- new InjectedAttributeOrStatistic.TypeValidator()
- {
- @Override
- public boolean appliesToType(final Class<? extends ConfiguredObject<?>> type)
- {
- return TestCar.class.isAssignableFrom(type);
- }
- };
final OperationParameter[] params = new OperationParameter[1];
params[0] = new OperationParameterFromInjection("count", Integer.TYPE, Integer.TYPE, "", "", new String[0],
- true);
+ false);
final ConfiguredObjectInjectedOperation<?> hello =
new ConfiguredObjectInjectedOperation<TestCar<?>>("sayHello", "", true,
false,
- "", params, method, new String[] { "Hello"}, validator
+ "", params, method, new String[] { "Hello"},
+ TYPE_VALIDATOR
);
final ConfiguredObjectInjectedOperation<?> goodbye =
new ConfiguredObjectInjectedOperation<TestCar<?>>("sayGoodbye", "", true,
false,
"",
- params, method, new String[] { "Goodbye"}, validator
+ params, method, new String[] { "Goodbye"},
+ TYPE_VALIDATOR
);
TestModel model = new TestModel(null, new TestInjector(hello, goodbye));
@@ -447,6 +392,52 @@ public class InjectedAttributeTest exten
assertEquals("Car say 'Goodbye' once", Collections.singletonList("Goodbye"), result);
}
+ public void testOperationWithMandatoryParameter_RejectsNullParameter() throws Exception
+ {
+ Method method = InjectedAttributeTest.class.getDeclaredMethod("ping", TestCar.class, String.class);
+
+ final OperationParameter[] params = new OperationParameter[1];
+ params[0] = new OperationParameterFromInjection("arg", String.class, String.class, "", "", new String[0], true);
+ final ConfiguredObjectInjectedOperation<?> operationInjector =
+ new ConfiguredObjectInjectedOperation<TestCar<?>>(method.getName(), "", true,
+ false,
+ "", params, method, null, TYPE_VALIDATOR);
+
+ TestModel model = new TestModel(null, new TestInjector(operationInjector));
+ TestCar testCar = new TestStandardCarImpl(Collections.<String,Object>singletonMap("name", "Arthur"), model);
+
+ final Map<String, ConfiguredObjectOperation<?>> allOperations =
+ model.getTypeRegistry().getOperations(testCar.getClass());
+
+ final ConfiguredObjectOperation operation = allOperations.get(method.getName());
+
+ try
+ {
+ operation.perform(testCar, Collections.<String, Object>emptyMap());
+ fail("Exception not thrown");
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // PASS
+ }
+
+ try
+ {
+ operation.perform(testCar, Collections.<String, Object>singletonMap("arg", null));
+ fail("Exception not thrown");
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // PASS
+ }
+
+ }
+
+ @SuppressWarnings("unused")
+ public static String ping(TestCar<?> car, String arg)
+ {
+ return arg;
+ }
public static int getMeaningOfLife(TestCar<?> car)
{
@@ -473,4 +464,5 @@ public class InjectedAttributeTest exten
}
return list;
}
+
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java Sun Dec 4 21:31:17 2016
@@ -49,5 +49,5 @@ public interface TestCar<X extends TestC
Door openDoor(@Param(name = "door") Door door);
@ManagedOperation(changesConfiguredObjectState = false)
- void startEngine(@Param(name = "keyCode", nullable = false) String keyCode);
+ void startEngine(@Param(name = "keyCode", mandatory = true) String keyCode);
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java Sun Dec 4 21:31:17 2016
@@ -418,7 +418,7 @@ public class ApiDocsServlet extends Abst
writer.append("<table class=\"parameters\">");
writer.append("<thead>");
writer.append(
- "<tr><th class=\"name\">Parameter Name</th><th>Type</th><th>Default</th><th>Nullable?</th><th>Description</th></tr>");
+ "<tr><th class=\"name\">Parameter Name</th><th>Type</th><th>Default</th><th>Mandatory?</th><th>Description</th></tr>");
writer.append("</thead>");
writer.append("<tbody>");
@@ -430,8 +430,8 @@ public class ApiDocsServlet extends Abst
+ renderType(param)
+ "</td><td class=\"default\">"
+ param.getDefaultValue()
- + "</td><td class=\"nullable\">"
- + param.isNullable()
+ + "</td><td class=\"mandatory\">"
+ + param.isMandatory()
+ "</td><td class=\"description\">"
+ param.getDescription()
+ "</td></tr>");
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java Sun Dec 4 21:31:17 2016
@@ -31,8 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -263,7 +261,7 @@ public class MetaDataServlet extends Abs
Map<String, Object> paramAttrs = new LinkedHashMap<>();
paramAttrs.put("type", param.getType().getSimpleName());
- paramAttrs.put("nullable", param.isNullable());
+ paramAttrs.put("mandatory", param.isMandatory());
if (!"".equals(param.getDefaultValue()))
{
paramAttrs.put("defaultValue", param.getDefaultValue());
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/apidocs.css
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/apidocs.css?rev=1772572&r1=1772571&r2=1772572&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/apidocs.css (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/apidocs.css Sun Dec 4 21:31:17 2016
@@ -72,7 +72,7 @@ table.parameters td.default {
width: 20em;
}
-table.parameters td.nullable {
+table.parameters td.mandatory {
width: 15em;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org