diff --git a/UptimeSharp/Components/Monitor.cs b/UptimeSharp/Components/Monitor.cs index a4ae1f4..86c6f4c 100644 --- a/UptimeSharp/Components/Monitor.cs +++ b/UptimeSharp/Components/Monitor.cs @@ -9,18 +9,27 @@ namespace UptimeSharp /// public partial class UptimeClient { + /// + /// Retrieves all monitors from UptimeRobot + /// + /// parameters, which are mapped to the officials from http://www.uptimerobot.com/api.asp#methods + /// + public List Get(GetParameters parameters) + { + return Get("getMonitors", parameters.Convert()).Items; + } + + /// /// Retrieves all monitors from UptimeRobot /// /// public List Get() { - GetParameters parameters = new GetParameters() + return Get(new GetParameters() { ShowAlerts = true - }; - - return Get("getMonitors", parameters.Convert()).Items; + }); } @@ -31,13 +40,11 @@ namespace UptimeSharp /// public Monitor Get(int monitorId) { - GetParameters parameters = new GetParameters() + return Get(new GetParameters() { Monitors = new int[] { monitorId }, ShowAlerts = true - }; - - return Get("getMonitors", parameters.Convert()).Items[0]; + }); } @@ -48,24 +55,11 @@ namespace UptimeSharp /// public List Get(int[] monitors) { - GetParameters parameters = new GetParameters() + return Get(new GetParameters() { Monitors = monitors, ShowAlerts = true - }; - - return Get("getMonitors", parameters.Convert()).Items; - } - - - /// - /// Retrieves all monitors from UptimeRobot - /// - /// parameters, which are mapped to the officials from http://www.uptimerobot.com/api.asp#methods - /// - public List Get(GetParameters parameters) - { - return Get("getMonitors", parameters.Convert()).Items; + }); } @@ -98,6 +92,19 @@ namespace UptimeSharp + /// + /// Creates a monitor. + /// + /// The monitor. + /// + /// success state + /// + public bool Add(MonitorParameters parameters) + { + return Get("newMonitor", parameters.Convert()).Status; + } + + /// /// Creates a HTTP/IP monitor. /// @@ -109,15 +116,13 @@ namespace UptimeSharp /// public bool Add(string name, string uri, int[] alerts = null) { - MonitorParameters parameters = new MonitorParameters() + return Add(new MonitorParameters() { Name = name, Uri = uri, Type = Type.HTTP, Alerts = alerts - }; - - return Get("newMonitor", parameters.Convert()).Status; + })); } @@ -134,7 +139,7 @@ namespace UptimeSharp /// public bool Add(string name, string uri, Subtype subtype, int? port = null, int[] alerts = null) { - MonitorParameters parameters = new MonitorParameters() + return Add(new MonitorParameters() { Name = name, Uri = uri, @@ -142,9 +147,7 @@ namespace UptimeSharp Subtype = subtype, Port = port, Alerts = alerts - }; - - return Get("newMonitor", parameters.Convert()).Status; + }); } @@ -161,7 +164,7 @@ namespace UptimeSharp /// public bool Add(string name, string uri, string keyword, KeywordType keywordType = KeywordType.Exists, int[] alerts = null) { - MonitorParameters parameters = new MonitorParameters() + return Add(new MonitorParameters() { Name = name, Uri = uri, @@ -169,22 +172,7 @@ namespace UptimeSharp KeywordValue = keyword, KeywordType = keywordType, Alerts = alerts - }; - - return Get("newMonitor", parameters.Convert()).Status; - } - - - /// - /// Creates a monitor. - /// - /// The monitor. - /// - /// success state - /// - public bool Add(MonitorParameters parameters) - { - return Get("newMonitor", parameters.Convert()).Status; + }); } } } \ No newline at end of file