Switch to helper API for reading post data.

hyperic · Jun 24, 2009 · 9e3b0a8 · 9e3b0a8
1 parent cc56502
commit 9e3b0a8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/hqu/hqapi1/app/AlertdefinitionController.groovy b/hqu/hqapi1/app/AlertdefinitionController.groovy
@@ -317,7 +317,7 @@ public class AlertdefinitionController extends ApiController {
     }
 
     def sync(params) {
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
         def definitions = []
 
         for (xmlDef in syncRequest['AlertDefinition']) {

diff --git a/hqu/hqapi1/app/EscalationController.groovy b/hqu/hqapi1/app/EscalationController.groovy
@@ -115,7 +115,7 @@ class EscalationController extends ApiController {
     def create(params) {
 
         def failureXml
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
         def esc
 
         if (syncRequest['Escalation'].size() != 1) {
@@ -166,7 +166,7 @@ class EscalationController extends ApiController {
 
     def update(params) {
         def failureXml
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
         def esc
 
         if (syncRequest['Escalation'].size() != 1) {
@@ -211,8 +211,7 @@ class EscalationController extends ApiController {
 
     def sync(params) {
         def failureXml
-        def data = getUpload('postdata')
-        def syncRequest = new XmlParser().parseText(data)
+        def syncRequest = new XmlParser().parseText(getPostData())
 
         for (xmlEsc in syncRequest['Escalation']) {
             def id           = xmlEsc.'@id'?.toInteger()

diff --git a/hqu/hqapi1/app/GroupController.groovy b/hqu/hqapi1/app/GroupController.groovy
@@ -100,7 +100,7 @@ class GroupController extends ApiController {
     }
 
     def sync(params) {
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
 
         def groups = []
 

diff --git a/hqu/hqapi1/app/MetricController.groovy b/hqu/hqapi1/app/MetricController.groovy
@@ -200,7 +200,7 @@ class MetricController extends ApiController {
     // TODO: Need collection based method for enable/disable
     def syncMetrics(params) {
 
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
         def xmlMetric = syncRequest['Metric']
         def failureXml = null
 
@@ -271,7 +271,7 @@ class MetricController extends ApiController {
 
     def syncTemplates(params) {
 
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
         def xmlTemplate = syncRequest['MetricTemplate']
         def failureXml = null
 

diff --git a/hqu/hqapi1/app/ResourceController.groovy b/hqu/hqapi1/app/ResourceController.groovy
@@ -153,7 +153,7 @@ class ResourceController extends ApiController {
     }
 
     def createPlatform(params) {
-        def createRequest = new XmlParser().parseText(getUpload('postdata'))
+        def createRequest = new XmlParser().parseText(getPostData())
         def xmlResource = createRequest['Resource']
         def xmlPrototype = createRequest['Prototype']
         def xmlIps = createRequest['Ip']
@@ -252,7 +252,7 @@ class ResourceController extends ApiController {
     }
 
     def createResource(params) {
-        def createRequest = new XmlParser().parseText(getUpload('postdata'))
+        def createRequest = new XmlParser().parseText(getPostData())
         def xmlParent = createRequest['Parent']
         def xmlResource = createRequest['Resource']
         def xmlPrototype = createRequest['Prototype']
@@ -683,7 +683,7 @@ class ResourceController extends ApiController {
     def sync(params) {
 
         def failureXml = null
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
 
         for (xmlResource in syncRequest['Resource']) {
             failureXml = syncResource(xmlResource, null)
@@ -706,7 +706,7 @@ class ResourceController extends ApiController {
     def syncResourceEdges(params) {
 
         def failureXml = null
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
 
         for (xmlResourceEdge in syncRequest['ResourceEdge']) {
             failureXml = updateResourceEdges("sync", xmlResourceEdge)
@@ -729,7 +729,7 @@ class ResourceController extends ApiController {
     def createResourceEdges(params) {
 
         def failureXml = null
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
 
         for (xmlResourceEdge in syncRequest['ResourceEdge']) {
             failureXml = updateResourceEdges("add", xmlResourceEdge)
@@ -752,7 +752,7 @@ class ResourceController extends ApiController {
     def deleteResourceEdges(params) {
 
         def failureXml = null
-        def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+        def syncRequest = new XmlParser().parseText(getPostData())
 
         for (xmlResourceEdge in syncRequest['ResourceEdge']) {
             failureXml = updateResourceEdges("remove", xmlResourceEdge)
@@ -891,7 +891,7 @@ class ResourceController extends ApiController {
 
     // Uses sync(), but does extra checks to ensure the resource exists.
     def update(params) {
-        def updateRequest = new XmlParser().parseText(getUpload('postdata'))
+        def updateRequest = new XmlParser().parseText(getPostData())
         def xmlResources = updateRequest['Resource']
         def failureXml = null
 

diff --git a/hqu/hqapi1/app/RoleController.groovy b/hqu/hqapi1/app/RoleController.groovy
@@ -71,7 +71,7 @@ class RoleController extends ApiController {
         def failureXml
         def createdRole
         try {
-            def createRequest = new XmlParser().parseText(getUpload('postdata'))
+            def createRequest = new XmlParser().parseText(getPostData())
             def xmlRole = createRequest['Role']
 
             if (!xmlRole || xmlRole.size() != 1) {
@@ -136,7 +136,7 @@ class RoleController extends ApiController {
     def update(params) {
         def failureXml
         try {
-            def updateRequest = new XmlParser().parseText(getUpload('postdata'))
+            def updateRequest = new XmlParser().parseText(getPostData())
             def xmlRole = updateRequest['Role']
 
             if (!xmlRole || xmlRole.size() != 1) {
@@ -204,7 +204,7 @@ class RoleController extends ApiController {
     def sync(params) {
         def failureXml
         try {
-            def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+            def syncRequest = new XmlParser().parseText(getPostData())
             for (xmlRole in syncRequest['Role']) {
                 def existing = getRole(xmlRole.'@id'?.toInteger(),
                                        xmlRole.'@name')

diff --git a/hqu/hqapi1/app/UserController.groovy b/hqu/hqapi1/app/UserController.groovy
@@ -138,7 +138,7 @@ class UserController extends ApiController {
     def sync(params) {
         def failureXml
         try {
-            def syncRequest = new XmlParser().parseText(getUpload('postdata'))
+            def syncRequest = new XmlParser().parseText(getPostData())
             for (xmlUser in syncRequest['User']) {
                 def existing = getUser(xmlUser.'@id'?.toInteger(),
                                        xmlUser.'@name')