Author: rgodfrey
Date: Tue Aug 2 15:24:11 2016
New Revision: 1754949
URL: http://svn.apache.org/viewvc?rev=1754949&view=rev
Log:
QPID-7359 : Update WMC to use new extract method and remove the old
extractInitialConfig parameter
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.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/ConfiguredObjectToMapConverter.java?rev=1754949&r1=1754948&r2=1754949&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
Tue Aug 2 15:24:11 2016
@@ -59,10 +59,7 @@ public class ConfiguredObjectToMapConver
Map<String, Object> object = new LinkedHashMap<>();
incorporateAttributesIntoMap(confObject, object, converterOptions);
- if(!converterOptions.isExtractAsConfig())
- {
- incorporateStatisticsIntoMap(confObject, object);
- }
+ incorporateStatisticsIntoMap(confObject, object);
if(converterOptions.getDepth() > 0)
{
@@ -77,117 +74,87 @@ public class ConfiguredObjectToMapConver
Map<String, Object> object,
ConverterOptions converterOptions)
{
- // if extracting as config add a fake attribute for each secondary
parent
- if(converterOptions.isExtractAsConfig() &&
confObject.getModel().getParentTypes(confObject.getCategoryClass()).size()>1)
- {
- Iterator<Class<? extends ConfiguredObject>> parentClasses =
-
confObject.getModel().getParentTypes(confObject.getCategoryClass()).iterator();
-
- // ignore the first parent which is supplied by structure
- parentClasses.next();
-
- while(parentClasses.hasNext())
- {
- Class<? extends ConfiguredObject> parentClass =
parentClasses.next();
- ConfiguredObject parent = confObject.getParent(parentClass);
- if(parent != null)
- {
- String categoryName = parentClass.getSimpleName();
-
object.put(categoryName.substring(0,1).toLowerCase()+categoryName.substring(1),
parent.getName());
- }
- }
- }
for(String name : confObject.getAttributeNames())
{
- if (!(converterOptions.isExtractAsConfig() &&
CONFIG_EXCLUDED_ATTRIBUTES.contains(name)))
+ Object value =
+ converterOptions.isUseActualValues()
+ ? confObject.getActualAttributes().get(name)
+ : confObject.getAttribute(name);
+ if (value instanceof ConfiguredObject)
+ {
+ object.put(name, ((ConfiguredObject) value).getName());
+ }
+ else if (ConfiguredObject.CONTEXT.equals(name))
{
- Object value =
- converterOptions.isUseActualValues() ?
confObject.getActualAttributes().get(name) : confObject.getAttribute(name);
- if (value instanceof ConfiguredObject)
+ Map<String, Object> contextValues = collectContext(confObject,
+
converterOptions.isExcludeInheritedContext(),
+
converterOptions.isUseActualValues());
+
+ if (!contextValues.isEmpty())
{
- object.put(name, ((ConfiguredObject) value).getName());
+ object.put(ConfiguredObject.CONTEXT, contextValues);
}
- else if (ConfiguredObject.CONTEXT.equals(name))
+ }
+ else if (value instanceof Collection)
+ {
+ List<Object> converted = new ArrayList<>();
+ for (Object member : (Collection) value)
{
- Map<String, Object> contextValues =
collectContext(confObject,
-
converterOptions.isExcludeInheritedContext(),
-
converterOptions.isUseActualValues());
-
- if (!contextValues.isEmpty())
+ if (member instanceof ConfiguredObject)
{
- object.put(ConfiguredObject.CONTEXT, contextValues);
+ converted.add(((ConfiguredObject) member).getName());
}
- }
- else if (value instanceof Collection)
- {
- List<Object> converted = new ArrayList<>();
- for (Object member : (Collection) value)
+ else
{
- if (member instanceof ConfiguredObject)
- {
- converted.add(((ConfiguredObject)
member).getName());
- }
- else
- {
- converted.add(member);
- }
+ converted.add(member);
}
- object.put(name, converted);
}
- else if (value instanceof Named)
+ object.put(name, converted);
+ }
+ else if (value instanceof Named)
+ {
+ object.put(name, ((Named) value).getName());
+ }
+ else if (value != null)
+ {
+ ConfiguredObjectAttribute<?, ?> attribute =
confObject.getModel()
+ .getTypeRegistry()
+ .getAttributeTypes(confObject.getClass())
+ .get(name);
+
+ if (attribute.isSecureValue(value))
{
- object.put(name, ((Named) value).getName());
+ // do not expose actual secure attribute value
+ // getAttribute() returns encoded value
+ value = confObject.getAttribute(name);
}
- else if (value != null)
- {
- ConfiguredObjectAttribute<?, ?> attribute =
confObject.getModel()
- .getTypeRegistry()
- .getAttributeTypes(confObject.getClass())
- .get(name);
-
- if (attribute.isSecureValue(value) &&
!(converterOptions.isSecureTransport() && converterOptions.isExtractAsConfig()))
- {
- // do not expose actual secure attribute value
- // getAttribute() returns encoded value
- value = confObject.getAttribute(name);
- }
- if(attribute.isOversized() &&
!converterOptions.isExtractAsConfig() && !converterOptions.isUseActualValues())
+ if (attribute.isOversized()
+ && !converterOptions.isUseActualValues())
+ {
+ String valueString = String.valueOf(value);
+ if (valueString.length() >
converterOptions.getOversizeThreshold())
{
- String valueString = String.valueOf(value);
- if(valueString.length() >
converterOptions.getOversizeThreshold())
- {
- String replacementValue =
"".equals(attribute.getOversizedAltText())
- ? String.valueOf(value).substring(0,
converterOptions.getOversizeThreshold() - 4) + "..."
- : attribute.getOversizedAltText();
+ String replacementValue =
"".equals(attribute.getOversizedAltText())
+ ? String.valueOf(value).substring(0,
converterOptions.getOversizeThreshold() - 4)
+ + "..."
+ : attribute.getOversizedAltText();
- object.put(name, replacementValue);
- }
- else
- {
- object.put(name, value);
- }
+ object.put(name, replacementValue);
}
else
{
object.put(name, value);
}
}
- else if (converterOptions.isExtractAsConfig())
+ else
{
- ConfiguredObjectAttribute<?, ?> attribute =
confObject.getModel()
- .getTypeRegistry()
- .getAttributeTypes(confObject.getClass())
- .get(name);
-
- if(attribute.isPersisted() && attribute.isDerived())
- {
- object.put(name, confObject.getAttribute(name));
- }
+ object.put(name, value);
}
}
+
}
}
@@ -279,48 +246,43 @@ public class ConfiguredObjectToMapConver
ConverterOptions childConverterOptions = new
ConverterOptions(converterOptions, converterOptions.getDepth() - 1);
for(Class<? extends ConfiguredObject> childClass : childTypes)
{
- if(!(converterOptions.isExtractAsConfig() &&
confObject.getModel().getParentTypes(childClass).iterator().next() !=
confObject.getCategoryClass()))
+ Collection children = confObject.getChildren(childClass);
+ if (children != null)
{
-
- Collection children = confObject.getChildren(childClass);
- if(children != null)
+ List<? extends ConfiguredObject> sortedChildren = new
ArrayList<ConfiguredObject>(children);
+ if (Comparable.class.isAssignableFrom(childClass))
{
- List<? extends ConfiguredObject> sortedChildren = new
ArrayList<ConfiguredObject>(children);
- if(Comparable.class.isAssignableFrom(childClass))
- {
- Collections.sort((List)sortedChildren);
- }
- else
+ Collections.sort((List) sortedChildren);
+ }
+ else
+ {
+ Collections.sort(sortedChildren, new
Comparator<ConfiguredObject>()
{
- Collections.sort(sortedChildren, new
Comparator<ConfiguredObject>()
+ @Override
+ public int compare(final ConfiguredObject o1, final
ConfiguredObject o2)
{
- @Override
- public int compare(final ConfiguredObject o1,
final ConfiguredObject o2)
- {
- return o1.getName().compareTo(o2.getName());
- }
- });
- }
- List<Map<String, Object>> childObjects = new ArrayList<>();
+ return o1.getName().compareTo(o2.getName());
+ }
+ });
+ }
+ List<Map<String, Object>> childObjects = new ArrayList<>();
- for (ConfiguredObject child : sortedChildren)
- {
- if (!(converterOptions.isExtractAsConfig() &&
!child.isDurable()))
- {
- childObjects.add(convertObjectToMap(child,
- childClass,
-
childConverterOptions));
- }
- }
+ for (ConfiguredObject child : sortedChildren)
+ {
+ childObjects.add(convertObjectToMap(child,
+ childClass,
+
childConverterOptions));
- if (!childObjects.isEmpty())
- {
- String childTypeSingular =
childClass.getSimpleName().toLowerCase();
- object.put(childTypeSingular +
(childTypeSingular.endsWith("s") ? "es" : "s"), childObjects);
- }
+ }
+
+ if (!childObjects.isEmpty())
+ {
+ String childTypeSingular =
childClass.getSimpleName().toLowerCase();
+ object.put(childTypeSingular +
(childTypeSingular.endsWith("s") ? "es" : "s"), childObjects);
}
}
+
}
}
@@ -329,7 +291,6 @@ public class ConfiguredObjectToMapConver
{
private final int _depth;
private final boolean _useActualValues;
- private final boolean _extractAsConfig;
private final int _oversizeThreshold;
private final boolean _secureTransport;
private final boolean _excludeInheritedContext;
@@ -338,7 +299,6 @@ public class ConfiguredObjectToMapConver
{
this(depth,
options.isUseActualValues(),
- options.isExtractAsConfig(),
options.getOversizeThreshold(),
options.isSecureTransport(),
options.isExcludeInheritedContext());
@@ -346,14 +306,12 @@ public class ConfiguredObjectToMapConver
public ConverterOptions(final int depth,
final boolean useActualValues,
- final boolean extractAsConfig,
final int oversizeThreshold,
final boolean secureTransport,
final boolean excludeInheritedContext)
{
_depth = depth;
_useActualValues = useActualValues;
- _extractAsConfig = extractAsConfig;
_oversizeThreshold = oversizeThreshold;
_secureTransport = secureTransport;
_excludeInheritedContext = excludeInheritedContext;
@@ -369,11 +327,6 @@ public class ConfiguredObjectToMapConver
return _useActualValues;
}
- public boolean isExtractAsConfig()
- {
- return _extractAsConfig;
- }
-
public int getOversizeThreshold()
{
return _oversizeThreshold;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.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/RestServlet.java?rev=1754949&r1=1754948&r2=1754949&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Tue Aug 2 15:24:11 2016
@@ -377,7 +377,6 @@ public class RestServlet extends Abstrac
{
// TODO - sort special params, everything else should act as a
filter
String attachmentFilename =
request.getParameter(CONTENT_DISPOSITION_ATTACHMENT_FILENAME_PARAM);
- boolean extractInitialConfig =
getBooleanParameterFromRequest(request, EXTRACT_INITIAL_CONFIG_PARAM);
if (attachmentFilename != null)
{
@@ -398,81 +397,72 @@ public class RestServlet extends Abstrac
int oversizeThreshold;
boolean excludeInheritedContext;
- if (extractInitialConfig)
- {
- depth = Integer.MAX_VALUE;
- oversizeThreshold = Integer.MAX_VALUE;
- actuals = true;
- excludeInheritedContext = true;
- }
- else
- {
- depth = getIntParameterFromRequest(request, DEPTH_PARAM,
DEFAULT_DEPTH);
- oversizeThreshold = getIntParameterFromRequest(request,
OVERSIZE_PARAM, DEFAULT_OVERSIZE);
- actuals = getBooleanParameterFromRequest(request,
ACTUALS_PARAM);
- String includeSystemContextParameter =
request.getParameter(INCLUDE_SYS_CONTEXT_PARAM);
- String inheritedActualsParameter =
request.getParameter(INHERITED_ACTUALS_PARAM);
- String excludeInheritedContextParameter =
request.getParameter(EXCLUDE_INHERITED_CONTEXT_PARAM);
+ depth = getIntParameterFromRequest(request, DEPTH_PARAM,
DEFAULT_DEPTH);
+ oversizeThreshold = getIntParameterFromRequest(request,
OVERSIZE_PARAM, DEFAULT_OVERSIZE);
+ actuals = getBooleanParameterFromRequest(request,
ACTUALS_PARAM);
+ String includeSystemContextParameter =
request.getParameter(INCLUDE_SYS_CONTEXT_PARAM);
+ String inheritedActualsParameter =
request.getParameter(INHERITED_ACTUALS_PARAM);
+ String excludeInheritedContextParameter =
request.getParameter(EXCLUDE_INHERITED_CONTEXT_PARAM);
- if (excludeInheritedContextParameter == null)
+ if (excludeInheritedContextParameter == null)
+ {
+ /* backward (pre v6.1) compatible behaviour */
+ if (inheritedActualsParameter == null &&
includeSystemContextParameter == null)
+ {
+ excludeInheritedContext = actuals;
+ }
+ else if (inheritedActualsParameter != null &&
includeSystemContextParameter != null)
{
- /* backward (pre v6.1) compatible behaviour */
- if (inheritedActualsParameter == null &&
includeSystemContextParameter == null)
+ if (actuals)
{
- excludeInheritedContext = actuals;
+ excludeInheritedContext =
!Boolean.parseBoolean(inheritedActualsParameter);
}
- else if (inheritedActualsParameter != null &&
includeSystemContextParameter != null)
+ else
{
- if (actuals)
- {
- excludeInheritedContext =
!Boolean.parseBoolean(inheritedActualsParameter);
- }
- else
- {
- excludeInheritedContext =
!Boolean.parseBoolean(includeSystemContextParameter);
- }
+ excludeInheritedContext =
!Boolean.parseBoolean(includeSystemContextParameter);
}
- else if (inheritedActualsParameter != null)
+ }
+ else if (inheritedActualsParameter != null)
+ {
+ if (actuals)
{
- if (actuals)
- {
- excludeInheritedContext =
!Boolean.parseBoolean(inheritedActualsParameter);
- }
- else
- {
- excludeInheritedContext = false;
- }
+ excludeInheritedContext =
!Boolean.parseBoolean(inheritedActualsParameter);
}
else
{
- if (actuals)
- {
- excludeInheritedContext = true;
- }
- else
- {
- excludeInheritedContext =
!Boolean.parseBoolean(includeSystemContextParameter);
- }
+ excludeInheritedContext = false;
}
}
else
{
- if (inheritedActualsParameter != null ||
includeSystemContextParameter != null)
+ if (actuals)
{
- sendJsonErrorResponse(request,
- response,
- SC_UNPROCESSABLE_ENTITY,
- String.format(
- "Parameter '%s'
cannot be specified together with '%s' or '%s'",
-
EXCLUDE_INHERITED_CONTEXT_PARAM,
-
INHERITED_ACTUALS_PARAM,
-
INCLUDE_SYS_CONTEXT_PARAM));
- return;
+ excludeInheritedContext = true;
}
- excludeInheritedContext =
Boolean.parseBoolean(excludeInheritedContextParameter);
+ else
+ {
+ excludeInheritedContext =
!Boolean.parseBoolean(includeSystemContextParameter);
+ }
+ }
+ }
+ else
+ {
+ if (inheritedActualsParameter != null ||
includeSystemContextParameter != null)
+ {
+ sendJsonErrorResponse(request,
+ response,
+ SC_UNPROCESSABLE_ENTITY,
+ String.format(
+ "Parameter '%s' cannot
be specified together with '%s' or '%s'",
+
EXCLUDE_INHERITED_CONTEXT_PARAM,
+ INHERITED_ACTUALS_PARAM,
+
INCLUDE_SYS_CONTEXT_PARAM));
+ return;
}
+ excludeInheritedContext =
Boolean.parseBoolean(excludeInheritedContextParameter);
}
+
List<Map<String, Object>> output = new ArrayList<>();
for (ConfiguredObject configuredObject : allObjects)
{
@@ -481,14 +471,13 @@ public class RestServlet extends Abstrac
new
ConfiguredObjectToMapConverter.ConverterOptions(
depth,
actuals,
-
extractInitialConfig,
oversizeThreshold,
request.isSecure(),
excludeInheritedContext)));
}
boolean sendCachingHeaders = attachmentFilename == null;
- sendJsonResponse(extractInitialConfig && output.size() == 1 ?
output.get(0) : output,
+ sendJsonResponse(output,
request,
response,
HttpServletResponse.SC_OK,
@@ -752,6 +741,7 @@ public class RestServlet extends Abstrac
if (operation.isNonModifying())
{
operationArguments =
getOperationArgumentsAsMap(request);
+
operationArguments.keySet().removeAll(Arrays.asList(CONTENT_DISPOSITION_ATTACHMENT_FILENAME_PARAM));
}
else
{
@@ -801,7 +791,6 @@ public class RestServlet extends Abstrac
final ConfiguredObjectToMapConverter.ConverterOptions
converterOptions =
new
ConfiguredObjectToMapConverter.ConverterOptions(DEFAULT_DEPTH,
false,
- false,
DEFAULT_OVERSIZE,
request.isSecure(),
true);
@@ -822,6 +811,14 @@ public class RestServlet extends Abstrac
}
returnVal = output;
}
+
+ String attachmentFilename =
request.getParameter(CONTENT_DISPOSITION_ATTACHMENT_FILENAME_PARAM);
+
+ if (attachmentFilename != null)
+ {
+ setContentDispositionHeaderIfNecessary(response,
attachmentFilename);
+ }
+
sendJsonResponse(returnVal, request, response);
}
}
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js?rev=1754949&r1=1754948&r2=1754949&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
Tue Aug 2 15:24:11 2016
@@ -334,10 +334,12 @@ define(["dojo/_base/lang",
// parent of the object in the same format, having
fields name, type, parent
// parameters: Object?
// is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ // operation: String?
+ // is optional String identifying the managed operation
to be called on the object
//
- Management.prototype.download = function (modelObj, parameters)
+ Management.prototype.download = function (modelObj, parameters,
operation)
{
- var url = this.buildObjectURL(modelObj, parameters);
+ var url = this.buildObjectURL(modelObj, parameters, operation);
setTimeout(function ()
{
window.location = url;
@@ -449,12 +451,18 @@ define(["dojo/_base/lang",
// parent of the object in the same format, having
fields name, type, parent
// parameters: Object?
// is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ // operation: String?
+ // is optional String identifying the managed operation
to be called on the object
//
// returns: full REST url for the hierarchy object
//
- Management.prototype.buildObjectURL = function (modelObj, parameters)
+ Management.prototype.buildObjectURL = function (modelObj, parameters,
operation)
{
var url = this.objectToURL(modelObj);
+ if(operation)
+ {
+ url = url + "/" + operation;
+ }
if (parameters)
{
url = url + "?" + ioQuery.objectToQuery(parameters);
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1754949&r1=1754948&r2=1754949&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Tue Aug 2 15:24:11 2016
@@ -149,9 +149,8 @@ define(["dojo/parser",
{
var suggestedAttachmentName =
encodeURIComponent(that.name + ".json");
that.management.download(that.modelObj, {
- extractInitialConfig: true,
contentDispositionAttachmentFilename:
suggestedAttachmentName
- });
+ }, "extractConfig");
});
that.deleteButton = registry.byNode(query(".deleteButton",
containerNode)[0]);
Modified:
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1754949&r1=1754948&r2=1754949&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
Tue Aug 2 15:24:11 2016
@@ -86,7 +86,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
0,
false,
-
false,
120,
false,
false));
@@ -109,7 +108,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
0,
false,
-
false,
120,
false,
false));
@@ -134,7 +132,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
0,
false,
-
false,
120,
false,
false));
@@ -160,7 +157,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
false,
-
false,
120,
false,
false));
@@ -205,7 +201,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
true,
-
false,
120,
false,
true));
@@ -223,7 +218,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObject.class,
new
ConfiguredObjectToMapConverter.ConverterOptions(1,
false,
-
false,
120,
false,
true));
@@ -265,7 +259,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
false,
-
false,
20,
false,
false));
@@ -283,7 +276,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObject.class,
new
ConfiguredObjectToMapConverter.ConverterOptions(1,
false,
-
false,
8,
false,
false));
@@ -305,7 +297,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObject.class,
new
ConfiguredObjectToMapConverter.ConverterOptions(1,
false,
-
false,
8,
false,
false));
@@ -351,7 +342,6 @@ public class ConfiguredObjectToMapConver
new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
false,
-
false,
20,
false,
false));
@@ -367,24 +357,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObject.class,
new
ConfiguredObjectToMapConverter.ConverterOptions(1,
true,
-
true,
-
20,
-
true,
-
false));
-
- children = resultMap.get("testchilds");
- assertNotNull(children);
- assertTrue(children instanceof Collection);
- assertTrue(((Collection)children).size()==1);
- attrs = ((Collection)children).iterator().next();
- assertTrue(attrs instanceof Map);
- assertEquals("secret", ((Map) attrs).get("secureAttribute"));
-
- resultMap = _converter.convertObjectToMap(_configuredObject,
- ConfiguredObject.class,
- new
ConfiguredObjectToMapConverter.ConverterOptions(1,
-
true,
-
false,
20,
true,
false));
@@ -404,7 +376,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObjectToMapConverter.ConverterOptions options = new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
false,
- false,
0,
false,
false);
@@ -434,7 +405,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObjectToMapConverter.ConverterOptions options = new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
true,
- false,
0,
false,
false);
@@ -463,7 +433,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObjectToMapConverter.ConverterOptions options = new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
false,
- false,
0,
false,
true);
@@ -481,7 +450,6 @@ public class ConfiguredObjectToMapConver
ConfiguredObjectToMapConverter.ConverterOptions options = new
ConfiguredObjectToMapConverter.ConverterOptions(
1,
true,
- false,
0,
false,
true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
