Rename Data<T> to XmlDeserializer<T>

lordmilko · Nov 19, 2017 · ae8cbd9 · ae8cbd9
1 parent d2b45db
commit ae8cbd9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/PrtgAPI/Objects/Deserialization/Data.cs → ...bjects/Deserialization/XmlDeserializer.cs b/PrtgAPI/Objects/Deserialization/Data.cs → ...bjects/Deserialization/XmlDeserializer.cs
@@ -10,7 +10,7 @@ namespace PrtgAPI.Objects.Deserialization
     /// </summary>
     /// <typeparam name="T">The type of objects to create from the request.</typeparam>
     [ExcludeFromCodeCoverage]
-    internal class Data<T>
+    internal class XmlDeserializer<T>
     {
         /// <summary>
         /// Total number of objects returned by the request.
@@ -30,9 +30,9 @@ internal class Data<T>
         [XmlElement("item")]
         public List<T> Items { get; set; }
 
-        internal static Data<T> DeserializeList(XDocument doc)
+        internal static XmlDeserializer<T> DeserializeList(XDocument doc)
         {
-            return DeserializeInternal<Data<T>, T>(doc);
+            return DeserializeInternal<XmlDeserializer<T>, T>(doc);
         }
 
         internal static T DeserializeType(XDocument doc)

diff --git a/PrtgAPI/PrtgClient.cs b/PrtgAPI/PrtgClient.cs
@@ -137,34 +137,34 @@ private string GetPassHash(string password)
 
         internal List<T> GetObjects<T>(Parameters.Parameters parameters) => GetObjectsRaw<T>(parameters).Items;
 
-        private Data<T> GetObjectsRaw<T>(Parameters.Parameters parameters)
+        private XmlDeserializer<T> GetObjectsRaw<T>(Parameters.Parameters parameters)
         {
             var response = requestEngine.ExecuteRequest(XmlFunction.TableData, parameters);
 
-            return Data<T>.DeserializeList(response);
+            return XmlDeserializer<T>.DeserializeList(response);
         }
 
         private async Task<List<T>> GetObjectsAsync<T>(Parameters.Parameters parameters) => (await GetObjectsRawAsync<T>(parameters).ConfigureAwait(false)).Items;
 
-        private async Task<Data<T>> GetObjectsRawAsync<T>(Parameters.Parameters parameters)
+        private async Task<XmlDeserializer<T>> GetObjectsRawAsync<T>(Parameters.Parameters parameters)
         {
             var response = await requestEngine.ExecuteRequestAsync(XmlFunction.TableData, parameters).ConfigureAwait(false);
 
-            return Data<T>.DeserializeList(response);
+            return XmlDeserializer<T>.DeserializeList(response);
         }
 
         private T GetObject<T>(XmlFunction function, Parameters.Parameters parameters, Action<string> responseValidator = null)
         {
             var response = requestEngine.ExecuteRequest(function, new Parameters.Parameters(), responseValidator);
 
-            return Data<T>.DeserializeType(response);
+            return XmlDeserializer<T>.DeserializeType(response);
         }
 
         private async Task<T> GetObjectAsync<T>(XmlFunction function, Parameters.Parameters parameters)
         {
             var response = await requestEngine.ExecuteRequestAsync(function, new Parameters.Parameters()).ConfigureAwait(false);
 
-            return Data<T>.DeserializeType(response);
+            return XmlDeserializer<T>.DeserializeType(response);
         }
 
         private T GetObject<T>(JsonFunction function, Parameters.Parameters parameters, Func<HttpResponseMessage, string> responseParser = null)
@@ -1525,7 +1525,7 @@ private T GetObjectProperties<T>(string response)
             var xml = ObjectSettings.GetXml(response);
             var xDoc = new XDocument(xml);
 
-            var items = Data<T>.DeserializeType(xDoc);
+            var items = XmlDeserializer<T>.DeserializeType(xDoc);
 
             return items;
         }
@@ -1848,7 +1848,7 @@ private void ValidateSensorHistoryResponse(string response)
 
         private List<SensorHistoryData> ParseSensorHistoryResponse(XDocument response, int sensorId)
         {
-            var items = Data<SensorHistoryData>.DeserializeList(response).Items;
+            var items = XmlDeserializer<SensorHistoryData>.DeserializeList(response).Items;
 
             var regex = new Regex("^(.+)(\\(.+\\))$");
 

diff --git a/PrtgAPI/Request/PrtgClient.AsyncHelpers.cs b/PrtgAPI/Request/PrtgClient.AsyncHelpers.cs
@@ -48,7 +48,7 @@ internal List<Channel> GetChannelsInternal(int sensorId, Func<string, bool> name
             }
 
             if (items.Count > 0)
-                return Data<Channel>.DeserializeList(response).Items;
+                return XmlDeserializer<Channel>.DeserializeList(response).Items;
 
             return new List<Channel>();
         }
@@ -77,7 +77,7 @@ internal async Task<List<Channel>> GetChannelsInternalAsync(int sensorId, Func<s
             }
 
             if (items.Count > 0)
-                return Data<Channel>.DeserializeList(response).Items;
+                return XmlDeserializer<Channel>.DeserializeList(response).Items;
 
             return new List<Channel>();
         }

diff --git a/PrtgAPI/Request/PrtgClient.AsyncHelpers.tt b/PrtgAPI/Request/PrtgClient.AsyncHelpers.tt
@@ -54,7 +54,7 @@ for(int i = 0; i < 2; i++)
             }
 
             if (items.Count > 0)
-                return Data<Channel>.DeserializeList(response).Items;
+                return XmlDeserializer<Channel>.DeserializeList(response).Items;
 
             return new List<Channel>();
         }
@@ -178,7 +178,8 @@ if(i == 0)
             else
                 returnType = $"Task<{returnType}>";
         }
-            return $"async {returnType} {name}Async";
+
+        return $"async {returnType} {name}Async";
     }
 
     public string CallFunction(string name, string parameters, int i)