From 65bd052f3e8682d177520af57db1c8ef5cb33262 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Sun, 13 Jan 2019 21:37:13 +0100 Subject: ReSharper conform to 'var' settings --- RSSDP/DeviceAvailableEventArgs.cs | 28 ++++++++++++++-------------- RSSDP/DeviceEventArgs.cs | 2 +- RSSDP/DeviceUnavailableEventArgs.cs | 6 +++--- RSSDP/DiscoveredSsdpDevice.cs | 2 +- RSSDP/DisposableManagedObjectBase.cs | 4 ++-- RSSDP/HttpParserBase.cs | 12 ++++++------ RSSDP/HttpRequestParser.cs | 14 +++++++------- RSSDP/HttpResponseParser.cs | 14 +++++++------- RSSDP/ISsdpDeviceLocator.cs | 2 +- RSSDP/ISsdpDevicePublisher.cs | 4 ++-- RSSDP/SsdpCommunicationsServer.cs | 12 ++++++------ RSSDP/SsdpDevice.cs | 6 +++--- RSSDP/SsdpDeviceLocator.cs | 4 ++-- RSSDP/SsdpDevicePublisher.cs | 10 +++++----- 14 files changed, 60 insertions(+), 60 deletions(-) (limited to 'RSSDP') diff --git a/RSSDP/DeviceAvailableEventArgs.cs b/RSSDP/DeviceAvailableEventArgs.cs index e52e801c49..9106e27e53 100644 --- a/RSSDP/DeviceAvailableEventArgs.cs +++ b/RSSDP/DeviceAvailableEventArgs.cs @@ -7,7 +7,7 @@ using MediaBrowser.Model.Net; namespace Rssdp { /// - /// Event arguments for the event. + /// Event arguments for the event. /// public sealed class DeviceAvailableEventArgs : EventArgs { @@ -18,17 +18,17 @@ namespace Rssdp private readonly DiscoveredSsdpDevice _DiscoveredDevice; private readonly bool _IsNewlyDiscovered; - #endregion + #endregion - #region Constructors + #region Constructors - /// - /// Full constructor. - /// - /// A instance representing the available device. - /// A boolean value indicating whether or not this device came from the cache. See for more detail. - /// Thrown if the parameter is null. - public DeviceAvailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool isNewlyDiscovered) + /// + /// Full constructor. + /// + /// A instance representing the available device. + /// A boolean value indicating whether or not this device came from the cache. See for more detail. + /// Thrown if the parameter is null. + public DeviceAvailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool isNewlyDiscovered) { if (discoveredDevice == null) throw new ArgumentNullException(nameof(discoveredDevice)); @@ -48,10 +48,10 @@ namespace Rssdp get { return _IsNewlyDiscovered; } } - /// - /// A reference to a instance containing the discovered details and allowing access to the full device description. - /// - public DiscoveredSsdpDevice DiscoveredDevice + /// + /// A reference to a instance containing the discovered details and allowing access to the full device description. + /// + public DiscoveredSsdpDevice DiscoveredDevice { get { return _DiscoveredDevice; } } diff --git a/RSSDP/DeviceEventArgs.cs b/RSSDP/DeviceEventArgs.cs index 55b23b68c9..3925ba2481 100644 --- a/RSSDP/DeviceEventArgs.cs +++ b/RSSDP/DeviceEventArgs.cs @@ -22,7 +22,7 @@ namespace Rssdp /// Constructs a new instance for the specified . /// /// The associated with the event this argument class is being used for. - /// Thrown if the argument is null. + /// Thrown if the argument is null. public DeviceEventArgs(SsdpDevice device) { if (device == null) throw new ArgumentNullException(nameof(device)); diff --git a/RSSDP/DeviceUnavailableEventArgs.cs b/RSSDP/DeviceUnavailableEventArgs.cs index ecba7c0132..d90ddfb603 100644 --- a/RSSDP/DeviceUnavailableEventArgs.cs +++ b/RSSDP/DeviceUnavailableEventArgs.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Rssdp { /// - /// Event arguments for the event. + /// Event arguments for the event. /// public sealed class DeviceUnavailableEventArgs : EventArgs { @@ -25,7 +25,7 @@ namespace Rssdp /// /// A instance representing the device that has become unavailable. /// A boolean value indicating whether this device is unavailable because it expired, or because it explicitly sent a byebye notification.. See for more detail. - /// Thrown if the parameter is null. + /// Thrown if the parameter is null. public DeviceUnavailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool expired) { if (discoveredDevice == null) throw new ArgumentNullException(nameof(discoveredDevice)); @@ -47,7 +47,7 @@ namespace Rssdp } /// - /// A reference to a instance containing the discovery details of the removed device. + /// A reference to a instance containing the discovery details of the removed device. /// public DiscoveredSsdpDevice DiscoveredDevice { diff --git a/RSSDP/DiscoveredSsdpDevice.cs b/RSSDP/DiscoveredSsdpDevice.cs index b643e3f081..f42e7c6747 100644 --- a/RSSDP/DiscoveredSsdpDevice.cs +++ b/RSSDP/DiscoveredSsdpDevice.cs @@ -11,7 +11,7 @@ namespace Rssdp /// Represents a discovered device, containing basic information about the device and the location of it's full device description document. Also provides convenience methods for retrieving the device description document. /// /// - /// + /// public sealed class DiscoveredSsdpDevice { diff --git a/RSSDP/DisposableManagedObjectBase.cs b/RSSDP/DisposableManagedObjectBase.cs index 9933194bc8..0f656fb469 100644 --- a/RSSDP/DisposableManagedObjectBase.cs +++ b/RSSDP/DisposableManagedObjectBase.cs @@ -20,10 +20,10 @@ namespace Rssdp.Infrastructure protected abstract void Dispose(bool disposing); /// - /// Throws and if the property is true. + /// Throws and if the property is true. /// /// - /// Thrown if the property is true. + /// Thrown if the property is true. /// protected virtual void ThrowIfDisposed() { diff --git a/RSSDP/HttpParserBase.cs b/RSSDP/HttpParserBase.cs index db496fe6fa..18712470da 100644 --- a/RSSDP/HttpParserBase.cs +++ b/RSSDP/HttpParserBase.cs @@ -26,19 +26,19 @@ namespace Rssdp.Infrastructure private static byte[] EmptyByteArray = new byte[]{}; /// - /// Parses the provided into either a or object. + /// Parses the provided into either a or object. /// /// A string containing the HTTP message to parse. - /// Either a or object containing the parsed data. + /// Either a or object containing the parsed data. public abstract T Parse(string data); /// - /// Parses a string containing either an HTTP request or response into a or object. + /// Parses a string containing either an HTTP request or response into a or object. /// - /// A or object representing the parsed message. + /// A or object representing the parsed message. /// A reference to the collection for the object. /// A string containing the data to be parsed. - /// An object containing the content of the parsed message. + /// An object containing the content of the parsed message. [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "Honestly, it's fine. MemoryStream doesn't mind.")] protected virtual void Parse(T message, System.Net.Http.Headers.HttpHeaders headers, string data) { @@ -61,7 +61,7 @@ namespace Rssdp.Infrastructure /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the . /// /// The first line of the HTTP message to be parsed. - /// Either a or to assign the parsed values to. + /// Either a or to assign the parsed values to. protected abstract void ParseStatusLine(string data, T message); /// diff --git a/RSSDP/HttpRequestParser.cs b/RSSDP/HttpRequestParser.cs index 1af7f0d515..d4505b8ad6 100644 --- a/RSSDP/HttpRequestParser.cs +++ b/RSSDP/HttpRequestParser.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace Rssdp.Infrastructure { /// - /// Parses a string into a or throws an exception. + /// Parses a string into a or throws an exception. /// public sealed class HttpRequestParser : HttpParserBase { @@ -26,17 +26,17 @@ namespace Rssdp.Infrastructure #region Public Methods /// - /// Parses the specified data into a instance. + /// Parses the specified data into a instance. /// /// A string containing the data to parse. - /// A instance containing the parsed data. - public override System.Net.Http.HttpRequestMessage Parse(string data) + /// A instance containing the parsed data. + public override HttpRequestMessage Parse(string data) { - System.Net.Http.HttpRequestMessage retVal = null; + HttpRequestMessage retVal = null; try { - retVal = new System.Net.Http.HttpRequestMessage(); + retVal = new HttpRequestMessage(); Parse(retVal, retVal.Headers, data); @@ -57,7 +57,7 @@ namespace Rssdp.Infrastructure /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the . /// /// The first line of the HTTP message to be parsed. - /// Either a or to assign the parsed values to. + /// Either a or to assign the parsed values to. protected override void ParseStatusLine(string data, HttpRequestMessage message) { if (data == null) throw new ArgumentNullException(nameof(data)); diff --git a/RSSDP/HttpResponseParser.cs b/RSSDP/HttpResponseParser.cs index d864a8bb74..a77c898ffe 100644 --- a/RSSDP/HttpResponseParser.cs +++ b/RSSDP/HttpResponseParser.cs @@ -9,9 +9,9 @@ using System.Threading.Tasks; namespace Rssdp.Infrastructure { /// - /// Parses a string into a or throws an exception. + /// Parses a string into a or throws an exception. /// - public sealed class HttpResponseParser : HttpParserBase + public sealed class HttpResponseParser : HttpParserBase { #region Fields & Constants @@ -26,16 +26,16 @@ namespace Rssdp.Infrastructure #region Public Methods /// - /// Parses the specified data into a instance. + /// Parses the specified data into a instance. /// /// A string containing the data to parse. - /// A instance containing the parsed data. + /// A instance containing the parsed data. public override HttpResponseMessage Parse(string data) { - System.Net.Http.HttpResponseMessage retVal = null; + HttpResponseMessage retVal = null; try { - retVal = new System.Net.Http.HttpResponseMessage(); + retVal = new HttpResponseMessage(); Parse(retVal, retVal.Headers, data); @@ -68,7 +68,7 @@ namespace Rssdp.Infrastructure /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the . /// /// The first line of the HTTP message to be parsed. - /// Either a or to assign the parsed values to. + /// Either a or to assign the parsed values to. protected override void ParseStatusLine(string data, HttpResponseMessage message) { if (data == null) throw new ArgumentNullException(nameof(data)); diff --git a/RSSDP/ISsdpDeviceLocator.cs b/RSSDP/ISsdpDeviceLocator.cs index 2351f5d621..8f0d39e75a 100644 --- a/RSSDP/ISsdpDeviceLocator.cs +++ b/RSSDP/ISsdpDeviceLocator.cs @@ -128,7 +128,7 @@ namespace Rssdp.Infrastructure /// /// Does nothing if this instance is not already listening for notifications. /// - /// Throw if the property is true. + /// Throw if the property is true. /// /// /// diff --git a/RSSDP/ISsdpDevicePublisher.cs b/RSSDP/ISsdpDevicePublisher.cs index da2607fc4e..7e914c109d 100644 --- a/RSSDP/ISsdpDevicePublisher.cs +++ b/RSSDP/ISsdpDevicePublisher.cs @@ -17,14 +17,14 @@ namespace Rssdp.Infrastructure /// Adds a device (and it's children) to the list of devices being published by this server, making them discoverable to SSDP clients. /// /// The instance to add. - /// An awaitable . + /// An awaitable . void AddDevice(SsdpRootDevice device); /// /// Removes a device (and it's children) from the list of devices being published by this server, making them undiscoverable. /// /// The instance to add. - /// An awaitable . + /// An awaitable . Task RemoveDevice(SsdpRootDevice device); /// diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs index 8fb33924f7..abd0dbdad9 100644 --- a/RSSDP/SsdpCommunicationsServer.cs +++ b/RSSDP/SsdpCommunicationsServer.cs @@ -73,7 +73,7 @@ namespace Rssdp.Infrastructure /// /// Minimum constructor. /// - /// The argument is null. + /// The argument is null. public SsdpCommunicationsServer(ISocketFactory socketFactory, INetworkManager networkManager, ILogger logger, bool enableMultiSocketBinding) : this(socketFactory, 0, SsdpConstants.SsdpDefaultMulticastTimeToLive, networkManager, logger, enableMultiSocketBinding) { @@ -82,8 +82,8 @@ namespace Rssdp.Infrastructure /// /// Full constructor. /// - /// The argument is null. - /// The argument is less than or equal to zero. + /// The argument is null. + /// The argument is less than or equal to zero. public SsdpCommunicationsServer(ISocketFactory socketFactory, int localPort, int multicastTimeToLive, INetworkManager networkManager, ILogger logger, bool enableMultiSocketBinding) { if (socketFactory == null) throw new ArgumentNullException(nameof(socketFactory)); @@ -111,7 +111,7 @@ namespace Rssdp.Infrastructure /// /// Causes the server to begin listening for multicast messages, being SSDP search requests and notifications. /// - /// Thrown if the property is true (because has been called previously). + /// Thrown if the property is true (because has been called previously). public void BeginListeningForBroadcasts() { ThrowIfDisposed(); @@ -138,7 +138,7 @@ namespace Rssdp.Infrastructure /// /// Causes the server to stop listening for multicast messages, being SSDP search requests and notifications. /// - /// Thrown if the property is true (because has been called previously). + /// Thrown if the property is true (because has been called previously). public void StopListeningForBroadcasts() { lock (_BroadcastListenSocketSynchroniser) @@ -269,7 +269,7 @@ namespace Rssdp.Infrastructure /// /// Stops listening for search responses on the local, unicast socket. /// - /// Thrown if the property is true (because has been called previously). + /// Thrown if the property is true (because has been called previously). public void StopListeningForResponses() { lock (_SendSocketSynchroniser) diff --git a/RSSDP/SsdpDevice.cs b/RSSDP/SsdpDevice.cs index 8dc1805c57..b4c4a88fdd 100644 --- a/RSSDP/SsdpDevice.cs +++ b/RSSDP/SsdpDevice.cs @@ -276,8 +276,8 @@ namespace Rssdp /// If the device is already a member of the collection, this method does nothing. /// Also sets the property of the added device and all descendant devices to the relevant instance. /// - /// Thrown if the argument is null. - /// Thrown if the is already associated with a different instance than used in this tree. Can occur if you try to add the same device instance to more than one tree. Also thrown if you try to add a device to itself. + /// Thrown if the argument is null. + /// Thrown if the is already associated with a different instance than used in this tree. Can occur if you try to add the same device instance to more than one tree. Also thrown if you try to add a device to itself. /// public void AddDevice(SsdpEmbeddedDevice device) { @@ -305,7 +305,7 @@ namespace Rssdp /// If the device is not a member of the collection, this method does nothing. /// Also sets the property to null for the removed device and all descendant devices. /// - /// Thrown if the argument is null. + /// Thrown if the argument is null. /// public void RemoveDevice(SsdpEmbeddedDevice device) { diff --git a/RSSDP/SsdpDeviceLocator.cs b/RSSDP/SsdpDeviceLocator.cs index ca6093725a..1348cce8da 100644 --- a/RSSDP/SsdpDeviceLocator.cs +++ b/RSSDP/SsdpDeviceLocator.cs @@ -185,7 +185,7 @@ namespace Rssdp.Infrastructure /// /// /// - /// Throw if the ty is true. + /// Throw if the ty is true. public void StartListeningForNotifications() { ThrowIfDisposed(); @@ -204,7 +204,7 @@ namespace Rssdp.Infrastructure /// /// /// - /// Throw if the property is true. + /// Throw if the property is true. public void StopListeningForNotifications() { ThrowIfDisposed(); diff --git a/RSSDP/SsdpDevicePublisher.cs b/RSSDP/SsdpDevicePublisher.cs index 031b908ddb..8a73e6a2d3 100644 --- a/RSSDP/SsdpDevicePublisher.cs +++ b/RSSDP/SsdpDevicePublisher.cs @@ -76,8 +76,8 @@ namespace Rssdp.Infrastructure /// This method ignores duplicate device adds (if the same device instance is added multiple times, the second and subsequent add calls do nothing). /// /// The instance to add. - /// Thrown if the argument is null. - /// Thrown if the contains property values that are not acceptable to the UPnP 1.0 specification. + /// Thrown if the argument is null. + /// Thrown if the contains property values that are not acceptable to the UPnP 1.0 specification. [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "t", Justification = "Capture task to local variable supresses compiler warning, but task is not really needed.")] public void AddDevice(SsdpRootDevice device) { @@ -85,7 +85,7 @@ namespace Rssdp.Infrastructure ThrowIfDisposed(); - TimeSpan minCacheTime = TimeSpan.Zero; + var minCacheTime = TimeSpan.Zero; bool wasAdded = false; lock (_Devices) { @@ -113,13 +113,13 @@ namespace Rssdp.Infrastructure /// This method does nothing if the device was not found in the collection. /// /// The instance to add. - /// Thrown if the argument is null. + /// Thrown if the argument is null. public async Task RemoveDevice(SsdpRootDevice device) { if (device == null) throw new ArgumentNullException(nameof(device)); bool wasRemoved = false; - TimeSpan minCacheTime = TimeSpan.Zero; + var minCacheTime = TimeSpan.Zero; lock (_Devices) { if (_Devices.Contains(device)) -- cgit v1.2.3