Add Resource and Group elements to Application list.

hyperic · Sep 16, 2009 · 86db5bc · 86db5bc
2 parents 4bba847 + 3eb8f30
commit 86db5bc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/hqu/hqapi1/app/ApplicationController.groovy b/hqu/hqapi1/app/ApplicationController.groovy
@@ -84,8 +84,22 @@ class ApplicationController extends ApiController {
     }
 
     def delete(params) {
+        def id = params.getOne('id')?.toInteger()
+
+        if (id == null) {
+            renderXml() {
+                out << StatusResponse() {
+                    out << getFailureXML(ErrorCode.INVALID_PARAMETERS)
+                }
+            }
+            return
+        }
+
         def failureXml = null
 
+        // TODO: remove next debugging line
+        print "ID: " + id
+
         renderXml() {
             StatusResponse() {
                 if (failureXml) {

diff --git a/src/org/hyperic/hq/hqapi1/test/ApplicationList_test.java b/src/org/hyperic/hq/hqapi1/test/ApplicationList_test.java
@@ -17,12 +17,13 @@ public void testList() throws Exception {
         ApplicationsResponse response = api.listApplications();
         // TODO: remove debugging lines
         System.out.println("TEST " + response);
-        System.out.println("TEST " + response.getApplication().size());
+        System.out.println("TEST - Apps: " + response.getApplication().size());
         if (response.getApplication().size() > 0) {
-            System.out.println("TEST " + response.getApplication().get(0).getLocation());
-            System.out.println("TEST " + response.getApplication().get(0).getDescription());
-            System.out.println("Resources: " + response.getApplication().get(0).getResource().size());
-            System.out.println("Groups: " + response.getApplication().get(0).getGroup().size());
+            System.out.println("APP 1: " + response.getApplication().get(0).getId());
+            System.out.println("APP 1: " + response.getApplication().get(0).getLocation());
+            System.out.println("APP 1: " + response.getApplication().get(0).getDescription());
+            System.out.println("APP 1 Resources: " + response.getApplication().get(0).getResource().size());
+            System.out.println("APP 1 Groups: " + response.getApplication().get(0).getGroup().size());
         }
         hqAssertSuccess(response);
     }