cleaned up ReSharper code issues

espenrl · espenrl · commit 94751b56ddb2 · 2017-05-25T23:07:05.000+02:00
diff --git a/erl.Oracle.TnsNames/ANTLR/DatabaseAddressNode.cs b/erl.Oracle.TnsNames/ANTLR/DatabaseAddressNode.cs
@@ -7,7 +7,7 @@ namespace erl.Oracle.TnsNames.ANTLR
     /// <summary>
     /// Used for internal representation during parse of TNS names file
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     public sealed class DatabaseAddressNode
     {
         public DatabaseAddressNode(TnsNamesParser.ParameterContext parameterContext)
diff --git a/erl.Oracle.TnsNames/ANTLR/TnsNameNode.cs b/erl.Oracle.TnsNames/ANTLR/TnsNameNode.cs
@@ -9,16 +9,13 @@ namespace erl.Oracle.TnsNames.ANTLR
     /// <summary>
     /// Used for internal representation during parse of TNS names file
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     public sealed class TnsNameNode
     {
         internal TnsNameNode([NotNull] string tnsName, [NotNull] TnsNamesParser.ParameterContext parameterContext)
         {
-            if (tnsName == null) throw new ArgumentNullException(nameof(tnsName));
-            if (parameterContext == null) throw new ArgumentNullException(nameof(parameterContext));
-
-            TnsName = tnsName;
-            ParameterContext = parameterContext;
+            TnsName = tnsName ?? throw new ArgumentNullException(nameof(tnsName));
+            ParameterContext = parameterContext ?? throw new ArgumentNullException(nameof(parameterContext));
         }
 
         public TnsNamesParser.ParameterContext ParameterContext { get; }
diff --git a/erl.Oracle.TnsNames/ANTLR/TnsNamesListenerErrorNode.cs b/erl.Oracle.TnsNames/ANTLR/TnsNamesListenerErrorNode.cs
@@ -1,7 +1,10 @@
+using JetBrains.Annotations;
+
 #pragma warning disable 1591 // Missing comments
 
 namespace erl.Oracle.TnsNames.ANTLR
 {
+    [PublicAPI]
     public class TnsNamesListenerErrorNode
     {
         public TnsNamesListenerErrorNode(TnsNamesParser.ParameterContext parameterContext, TnsNamesParseError parseError)
diff --git a/erl.Oracle.TnsNames/Helper/JunctionPoint.cs b/erl.Oracle.TnsNames/Helper/JunctionPoint.cs
@@ -7,6 +7,8 @@
 // ReSharper disable UnusedMember.Local
 // ReSharper disable FieldCanBeMadeReadOnly.Local
 // ReSharper disable InconsistentNaming
+// ReSharper disable MemberCanBePrivate.Local
+// ReSharper disable UnusedMember.Global
 
 // Fetched from: http://www.codeproject.com/Articles/15633/Manipulating-NTFS-Junction-Points-in-NET
 
diff --git a/erl.Oracle.TnsNames/IpDatabaseAddress.cs b/erl.Oracle.TnsNames/IpDatabaseAddress.cs
@@ -7,7 +7,7 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     /// Database address for a TNS name.
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public sealed class IpDatabaseAddress : IDatabaseAddress
     {
@@ -20,14 +20,11 @@ public sealed class IpDatabaseAddress : IDatabaseAddress
         /// <param name="rawAddress"></param>
         public IpDatabaseAddress([NotNull] string protocol, [NotNull] string host, int port, [NotNull] string rawAddress)
         {
-            if (protocol == null) throw new ArgumentNullException(nameof(protocol));
-            if (host == null) throw new ArgumentNullException(nameof(host));
             if (port < 1 || port > 65535) throw new ArgumentOutOfRangeException(nameof(port), port, "Port should be in range 1-65535.");
-            if (rawAddress == null) throw new ArgumentNullException(nameof(rawAddress));
-            Protocol = protocol;
-            Host = host;
+            Protocol = protocol ?? throw new ArgumentNullException(nameof(protocol));
+            Host = host ?? throw new ArgumentNullException(nameof(host));
             Port = port;
-            RawAddress = rawAddress;
+            RawAddress = rawAddress ?? throw new ArgumentNullException(nameof(rawAddress));
         }
 
         /// <inheritdoc />
diff --git a/erl.Oracle.TnsNames/IpcDatabaseAddress.cs b/erl.Oracle.TnsNames/IpcDatabaseAddress.cs
@@ -7,7 +7,7 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     /// 
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public sealed class IpcDatabaseAddress : IDatabaseAddress
     {
@@ -19,12 +19,9 @@ public sealed class IpcDatabaseAddress : IDatabaseAddress
         /// <param name="rawAddress"></param>
         public IpcDatabaseAddress([NotNull] string protocol, [NotNull] string key, [NotNull] string rawAddress)
         {
-            if (protocol == null) throw new ArgumentNullException(nameof(protocol));
-            if (key == null) throw new ArgumentNullException(nameof(key));
-            if (rawAddress == null) throw new ArgumentNullException(nameof(rawAddress));
-            Protocol = protocol;
-            Key = key;
-            RawAddress = rawAddress;
+            Protocol = protocol ?? throw new ArgumentNullException(nameof(protocol));
+            Key = key ?? throw new ArgumentNullException(nameof(key));
+            RawAddress = rawAddress ?? throw new ArgumentNullException(nameof(rawAddress));
         }
 
         /// <inheritdoc />
diff --git a/erl.Oracle.TnsNames/JetBrains.Annotations.cs b/erl.Oracle.TnsNames/JetBrains.Annotations.cs
@@ -29,6 +29,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // ReSharper disable IntroduceOptionalParameters.Global
 // ReSharper disable MemberCanBeProtected.Global
 // ReSharper disable InconsistentNaming
+// ReSharper disable once CheckNamespace
+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Local
 
 namespace JetBrains.Annotations
 {
diff --git a/erl.Oracle.TnsNames/NamedPipeDatabaseAddress.cs b/erl.Oracle.TnsNames/NamedPipeDatabaseAddress.cs
@@ -8,7 +8,7 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     /// 
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public sealed class NamedPipeDatabaseAddress : IDatabaseAddress
     {
@@ -21,15 +21,10 @@ public sealed class NamedPipeDatabaseAddress : IDatabaseAddress
         /// <param name="rawAddress"></param>
         public NamedPipeDatabaseAddress([NotNull] string protocol, [NotNull] string server, [NotNull] string pipe, [NotNull] string rawAddress)
         {
-            if (protocol == null) throw new ArgumentNullException(nameof(protocol));
-            if (server == null) throw new ArgumentNullException(nameof(server));
-            if (pipe == null) throw new ArgumentNullException(nameof(pipe));
-            if (rawAddress == null) throw new ArgumentNullException(nameof(rawAddress));
-
-            Protocol = protocol;
-            Server = server;
-            Pipe = pipe;
-            RawAddress = rawAddress;
+            Protocol = protocol ?? throw new ArgumentNullException(nameof(protocol));
+            Server = server ?? throw new ArgumentNullException(nameof(server));
+            Pipe = pipe ?? throw new ArgumentNullException(nameof(pipe));
+            RawAddress = rawAddress ?? throw new ArgumentNullException(nameof(rawAddress));
         }
 
         /// <inheritdoc />
diff --git a/erl.Oracle.TnsNames/TnsNameInfo.cs b/erl.Oracle.TnsNames/TnsNameInfo.cs
@@ -6,7 +6,7 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     /// Info about a TNS name.
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public sealed class TnsNameInfo
     {
diff --git a/erl.Oracle.TnsNames/TnsNamesFile.cs b/erl.Oracle.TnsNames/TnsNamesFile.cs
@@ -7,7 +7,7 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     /// Content of a TNS names file.
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay, nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public sealed class TnsNamesFile
     {
@@ -27,15 +27,13 @@ public sealed class TnsNamesFile
         public TnsNamesFile(TnsNamesFileInfo info, [NotNull] TnsNamesFileInfo[] iFileEntries, [NotNull] TnsNameInfo[] tnsNames)
         {
             if (info == null) throw new ArgumentNullException(nameof(info));
-            if (iFileEntries == null) throw new ArgumentNullException(nameof(iFileEntries));
-            if (tnsNames == null) throw new ArgumentNullException(nameof(tnsNames));
 
             Parent = info.Parent;
             Filepath = info.Filepath;
             Source = info.Source;
             SourceOrder = info.SourceOrder;
-            TnsNames = tnsNames;
-            IfileEntries = iFileEntries;
+            TnsNames = tnsNames ?? throw new ArgumentNullException(nameof(tnsNames));
+            IfileEntries = iFileEntries ?? throw new ArgumentNullException(nameof(iFileEntries));
 
             foreach (var tnsNameInfo in tnsNames)
             {
diff --git a/erl.Oracle.TnsNames/TnsNamesFileInfo.cs b/erl.Oracle.TnsNames/TnsNamesFileInfo.cs
@@ -7,15 +7,13 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     /// Info about a TNS names file.
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay, nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public sealed class TnsNamesFileInfo
     {
         public TnsNamesFileInfo(string filepath, TnsNamesSource source, TnsNamesFileInfo parent = null, int sourceOrder = 1)
         {
-            if (filepath == null) throw new ArgumentNullException(nameof(filepath));
-
-            Filepath = filepath;
+            Filepath = filepath ?? throw new ArgumentNullException(nameof(filepath));
             Source = source;
             SourceOrder = sourceOrder;
             Parent = parent;
diff --git a/erl.Oracle.TnsNames/UnknownDatabaseAddress.cs b/erl.Oracle.TnsNames/UnknownDatabaseAddress.cs
@@ -7,7 +7,7 @@ namespace erl.Oracle.TnsNames
     /// <summary>
     ///
     /// </summary>
-    [DebuggerDisplay("{DebuggerDisplay, nq}")]
+    [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
     [PublicAPI]
     public class UnknownDatabaseAddress : IDatabaseAddress
     {
@@ -18,10 +18,8 @@ public class UnknownDatabaseAddress : IDatabaseAddress
         /// <param name="rawAddress"></param>
         public UnknownDatabaseAddress([NotNull] string protocol, [NotNull] string rawAddress)
         {
-            if (protocol == null) throw new ArgumentNullException(nameof(protocol));
-            if (rawAddress == null) throw new ArgumentNullException(nameof(rawAddress));
-            Protocol = protocol;
-            RawAddress = rawAddress;
+            Protocol = protocol ?? throw new ArgumentNullException(nameof(protocol));
+            RawAddress = rawAddress ?? throw new ArgumentNullException(nameof(rawAddress));
         }
 
         /// <inheritdoc />

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace erl.Oracle.TnsNames.ANTLR`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Used for internal representation during parse of TNS names file`
`9`	`9`	`/// </summary>`
`10`		`- [DebuggerDisplay("{DebuggerDisplay,nq}")]`
	`10`	`+ [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]`
`11`	`11`	`public sealed class DatabaseAddressNode`
`12`	`12`	`{`
`13`	`13`	`public DatabaseAddressNode(TnsNamesParser.ParameterContext parameterContext)`
Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,13 @@ namespace erl.Oracle.TnsNames.ANTLR`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Used for internal representation during parse of TNS names file`
`11`	`11`	`/// </summary>`
`12`		`- [DebuggerDisplay("{DebuggerDisplay,nq}")]`
	`12`	`+ [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]`
`13`	`13`	`public sealed class TnsNameNode`
`14`	`14`	`{`
`15`	`15`	`internal TnsNameNode([NotNull] string tnsName, [NotNull] TnsNamesParser.ParameterContext parameterContext)`
`16`	`16`	`{`
`17`		`- if (tnsName == null) throw new ArgumentNullException(nameof(tnsName));`
`18`		`- if (parameterContext == null) throw new ArgumentNullException(nameof(parameterContext));`
`19`		`-`
`20`		`- TnsName = tnsName;`
`21`		`- ParameterContext = parameterContext;`
	`17`	`+ TnsName = tnsName ?? throw new ArgumentNullException(nameof(tnsName));`
	`18`	`+ ParameterContext = parameterContext ?? throw new ArgumentNullException(nameof(parameterContext));`
`22`	`19`	`}`
`23`	`20`
`24`	`21`	`public TnsNamesParser.ParameterContext ParameterContext { get; }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
	`1`	`+using JetBrains.Annotations;`
	`2`	`+`
`1`	`3`	`#pragma warning disable 1591 // Missing comments`
`2`	`4`
`3`	`5`	`namespace erl.Oracle.TnsNames.ANTLR`
`4`	`6`	`{`
	`7`	`+ [PublicAPI]`
`5`	`8`	`public class TnsNamesListenerErrorNode`
`6`	`9`	`{`
`7`	`10`	`public TnsNamesListenerErrorNode(TnsNamesParser.ParameterContext parameterContext, TnsNamesParseError parseError)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE`
`29`	`29`	`// ReSharper disable IntroduceOptionalParameters.Global`
`30`	`30`	`// ReSharper disable MemberCanBeProtected.Global`
`31`	`31`	`// ReSharper disable InconsistentNaming`
	`32`	`+// ReSharper disable once CheckNamespace`
	`33`	`+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Local`
`32`	`34`
`33`	`35`	`namespace JetBrains.Annotations`
`34`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace erl.Oracle.TnsNames`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Info about a TNS name.`
`8`	`8`	`/// </summary>`
`9`		`- [DebuggerDisplay("{DebuggerDisplay,nq}")]`
	`9`	`+ [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]`
`10`	`10`	`[PublicAPI]`
`11`	`11`	`public sealed class TnsNameInfo`
`12`	`12`	`{`