Some refactoring of the RestObjectPoster (and related classes).

5 files changed, 17 insertions, 7 deletions

diff --git a/OpenSim/Framework/Servers/RestObjectPoster.cs b/OpenSim/Framework/Servers/RestObjectPoster.cs
index 9bcfcca..991b1d5 100644
--- a/OpenSim/Framework/Servers/RestObjectPoster.cs
+++ b/OpenSim/Framework/Servers/RestObjectPoster.cs
@@ -11,10 +11,15 @@ namespace OpenSim.Framework.Servers
     {
         public static void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
         {
+            BeginPostObject("POST", requestUrl, obj);
+        }
+
+        public static void BeginPostObject<TRequest>(string verb, string requestUrl, TRequest obj)
+        {
             Type type = typeof(TRequest);
 
             WebRequest request = WebRequest.Create(requestUrl);
-            request.Method = "POST";
+            request.Method = verb;
             request.ContentType = "text/xml";
 
             MemoryStream buffer = new MemoryStream();
diff --git a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
index eeae285..d91d566 100644
--- a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
+++ b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
@@ -15,10 +15,15 @@ namespace OpenSim.Framework.Servers
 
         public void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
         {
+            BeginPostObject("POST", requestUrl, obj);
+        }
+
+        public void BeginPostObject<TRequest>(string verb, string requestUrl, TRequest obj)
+        {
             Type type = typeof(TRequest);
 
             WebRequest request = WebRequest.Create(requestUrl);
-            request.Method = "POST";
+            request.Method = verb;
             request.ContentType = "text/xml";
 
             MemoryStream buffer = new MemoryStream();
diff --git a/OpenSim/Framework/Servers/SynchronousRestObjectPoster.cs b/OpenSim/Framework/Servers/SynchronousRestObjectPoster.cs
index dde4c02..11a74b1 100644
--- a/OpenSim/Framework/Servers/SynchronousRestObjectPoster.cs
+++ b/OpenSim/Framework/Servers/SynchronousRestObjectPoster.cs
@@ -9,12 +9,12 @@ namespace OpenSim.Framework.Servers
 {
     public class SynchronousRestObjectPoster
     {
-        public static TResponse BeginPostObject<TRequest, TResponse>(string requestUrl, TRequest obj)
+        public static TResponse BeginPostObject<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
         {
             Type type = typeof(TRequest);
 
             WebRequest request = WebRequest.Create(requestUrl);
-            request.Method = "POST";
+            request.Method = verb;
             request.ContentType = "text/xml";
 
             MemoryStream buffer = new MemoryStream();
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 634698e..d2ad6ae 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Grid.UserServer
                   //  RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
                    // requester.ReturnResponseVal = TestResponse;
                    // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
-                    List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
+                    List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject< LLUUID, List<InventoryFolderBase>>("POST",m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
                     break;
             }
         }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 4d1328e..ccd3548 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -197,12 +197,12 @@ namespace OpenSim.Grid.UserServer
 
         protected override InventoryData CreateInventoryData(LLUUID userID)
         {
-            List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID);
+            List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>("POST", m_config.InventoryUrl + "RootFolders/", userID);
             if (folders ==null | folders.Count == 0)
             {
                 RestObjectPoster.BeginPostObject<LLUUID>(m_config.InventoryUrl + "CreateInventory/", userID);
                 Thread.Sleep(1000);
-                folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID);
+                folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>("POST", m_config.InventoryUrl + "RootFolders/", userID);
             }
 
             if(folders.Count >0)