[Bug 1402333] - Include the resource column in the exported Alert Def…

…initions report.
rhq-project · Aug 2, 2017 · c9305ca · c9305ca
1 parent 4047e78
commit c9305ca
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...er/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java b/...er/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
@@ -76,7 +76,7 @@ public PageList<AlertDefinition> execute(AlertDefinitionCriteria criteria) {
 
                     CsvWriter<AlertDefinition> csvWriter = new CsvWriter<AlertDefinition>();
                     csvWriter.setColumns("name", "description", "enabled", "priority", "parent", "ancestry",
-                        "detailsURL");
+                            "detailsURL", "resource");
 
                     csvWriter.setPropertyConverter("parent", new PropertyConverter<AlertDefinition>() {
                         @Override
@@ -85,6 +85,13 @@ public Object convert(AlertDefinition alertDef, String propertyName) {
                         }
                     });
 
+                    csvWriter.setPropertyConverter("resource", new PropertyConverter<AlertDefinition>() {
+                        @Override
+                        public Object convert(AlertDefinition alertDef, String propertyName) {
+                            return alertDef.getResource().getName();
+                        }
+                    });
+
                     csvWriter.setPropertyConverter("ancestry", new PropertyConverter<AlertDefinition>() {
                         @Override
                         public Object convert(AlertDefinition alertDef, String propertyName) {
@@ -122,7 +129,7 @@ private String getParentURL(AlertDefinition alertDef) {
 
 
                 private String getHeader(){
-                   return "Name,Description,Enabled,Priority,Parent,Ancestry,Details URL";
+                   return "Name,Description,Enabled,Priority,Parent,Ancestry,Details URL,Resource";
                 }
 
                 private String getDetailsURL(AlertDefinition alertDef) {