starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-03-25 02:41:53 +01:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Add ValidatedNotNullAttribute (for SonarQube) (#452)

Browse Source 
* ValidatedNotNull

* usings
This commit is contained in:
Stef Heyenrath
2020-04-10 22:51:34 +02:00
committed by GitHub
parent dac73b6fe0
commit e8a4d52797
3 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WireMock.Net/Util/BodyParser.cs
View File

@@ -1,7 +1,5 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Text; using System.Text;

50
src/WireMock.Net/Validation/Check.cs
View File

@@ -16,7 +16,7 @@ namespace WireMock.Validation
internal static class Check internal static class Check
{ {
[ContractAnnotation("value:null => halt")] [ContractAnnotation("value:null => halt")]
public static T Condition<T>([NoEnumeration] T value, [NotNull] Predicate<T> condition, [InvokerParameterName] [NotNull] string parameterName) public static T Condition<T>([NoEnumeration] T value, [ValidatedNotNull, NotNull] Predicate<T> condition, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
{ {
NotNull(condition, nameof(condition)); NotNull(condition, nameof(condition));
NotNull(value, nameof(value)); NotNull(value, nameof(value));
@@ -32,7 +32,7 @@ namespace WireMock.Validation
} }
[ContractAnnotation("value:null => halt")] [ContractAnnotation("value:null => halt")]
public static T NotNull<T>([NoEnumeration] T value, [InvokerParameterName] [NotNull] string parameterName) public static T NotNull<T>([NoEnumeration] T value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
{ {
if (ReferenceEquals(value, null)) if (ReferenceEquals(value, null))
{ {
@@ -45,7 +45,7 @@ namespace WireMock.Validation
} }
[ContractAnnotation("value:null => halt")] [ContractAnnotation("value:null => halt")]
public static T NotNull<T>([NoEnumeration] T value, [InvokerParameterName] [NotNull] string parameterName, [NotNull] string propertyName) public static T NotNull<T>([NoEnumeration] T value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName, [ValidatedNotNull, NotNull] string propertyName)
{ {
if (ReferenceEquals(value, null)) if (ReferenceEquals(value, null))
{ {
@@ -59,7 +59,7 @@ namespace WireMock.Validation
} }
[ContractAnnotation("value:null => halt")] [ContractAnnotation("value:null => halt")]
public static IList<T> NotNullOrEmpty<T>(IList<T> value, [InvokerParameterName] [NotNull] string parameterName) public static IList<T> NotNullOrEmpty<T>(IList<T> value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
{ {
NotNull(value, parameterName); NotNull(value, parameterName);
@@ -74,7 +74,7 @@ namespace WireMock.Validation
} }
[ContractAnnotation("value:null => halt")] [ContractAnnotation("value:null => halt")]
public static string NotNullOrEmpty(string value, [InvokerParameterName] [NotNull] string parameterName) public static string NotNullOrEmpty(string value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
{ {
Exception e = null; Exception e = null;
if (ReferenceEquals(value, null)) if (ReferenceEquals(value, null))
@@ -96,20 +96,20 @@ namespace WireMock.Validation
return value; return value;
} }
public static string NullButNotEmpty(string value, [InvokerParameterName] [NotNull] string parameterName) //public static string NullButNotEmpty(string value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
{ //{
if (!ReferenceEquals(value, null) // if (!ReferenceEquals(value, null)
&& (value.Length == 0)) // && (value.Length == 0))
{ // {
NotNullOrEmpty(parameterName, nameof(parameterName)); // NotNullOrEmpty(parameterName, nameof(parameterName));
throw new ArgumentException(CoreStrings.ArgumentIsEmpty(parameterName)); // throw new ArgumentException(CoreStrings.ArgumentIsEmpty(parameterName));
} // }
return value; // return value;
} //}
public static IList<T> HasNoNulls<T>(IList<T> value, [InvokerParameterName] [NotNull] string parameterName) public static IList<T> HasNoNulls<T>(IList<T> value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
where T : class where T : class
{ {
NotNull(value, parameterName); NotNull(value, parameterName);
@@ -124,16 +124,16 @@ namespace WireMock.Validation
return value; return value;
} }
public static Type ValidEntityType(Type value, [InvokerParameterName] [NotNull] string parameterName) //public static Type ValidEntityType(Type value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
{ //{
if (!value.GetTypeInfo().IsClass) // if (!value.GetTypeInfo().IsClass)
{ // {
NotNullOrEmpty(parameterName, nameof(parameterName)); // NotNullOrEmpty(parameterName, nameof(parameterName));
throw new ArgumentException(CoreStrings.InvalidEntityType(value, parameterName)); // throw new ArgumentException(CoreStrings.InvalidEntityType(value, parameterName));
} // }
return value; // return value;
} //}
} }
} }

11
src/WireMock.Net/Validation/ValidatedNotNullAttribute.cs Normal file
View File

@@ -0,0 +1,11 @@
using System;
namespace WireMock.Validation
{
/// <summary>
/// To fix 'xxx' is null on at least one execution path. See also https://rules.sonarsource.com/csharp/RSPEC-3900.
/// </summary>
internal class ValidatedNotNullAttribute : Attribute
{
}
}