Branch: refs/heads/master
Home:
https://github.com/rhq-project/rhq
Commit: dad83f3ab84e87e67b4c58d2ce7477a2a782e485
https://github.com/rhq-project/rhq/commit/dad83f3ab84e87e67b4c58d2ce7477a...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertNotificationRest.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/ConfigurationHelper.java
M
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationHelperTest.java
M
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/AlertNotification.java
Log Message:
-----------
Bug 1041393 - alert notification of type Resource operations is not
correctly rendered by API
AlertNotificationRest extended with extraConfig field where we now output
notification extra config (in case of Resource Operations alert sender, it's
input parameters for operation)
With this commit we now also properly render alert notification config
(simple property types mapped correctly to JSON/XML, not "just" string
values)
This commit fixes ConfigurationHelper#configurationToMap which transforms
Configuration to generic Map, now it can work without Configuration
Definition
- as a fall-back it maps all simple properties to string values.