Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: minor refactors #1619

Merged
merged 1 commit into from
Nov 26, 2023
Merged

chore: minor refactors #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 58 additions & 60 deletions Refit/FormValueMultimap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,86 +48,84 @@ public FormValueMultimap(object source, RefitSettings settings)

lock (PropertyCache)
{
if (!PropertyCache.ContainsKey(type))
if (!PropertyCache.TryGetValue(type, out var properties))
{
PropertyCache[type] = GetProperties(type);
properties = GetProperties(type);
PropertyCache[type] = properties;
}

foreach (var property in PropertyCache[type])
foreach (var property in properties)
{
var value = property.GetValue(source, null);
if (value != null)
if (value == null)
continue;

var fieldName = GetFieldNameForProperty(property);

// see if there's a query attribute
var attrib = property.GetCustomAttribute<QueryAttribute>(true);

if (value is not IEnumerable enumerable)
{
var fieldName = GetFieldNameForProperty(property);
Add(
fieldName,
settings.FormUrlEncodedParameterFormatter.Format(value, attrib?.Format)
);
continue;
}

// see if there's a query attribute
var attrib = property.GetCustomAttribute<QueryAttribute>(true);
var collectionFormat =
attrib != null && attrib.IsCollectionFormatSpecified
? attrib.CollectionFormat
: settings.CollectionFormat;

if (value is IEnumerable enumerable)
{
var collectionFormat =
attrib != null && attrib.IsCollectionFormatSpecified
? attrib.CollectionFormat
: settings.CollectionFormat;
switch (collectionFormat)
{
case CollectionFormat.Multi:
foreach (var item in enumerable)
{
Add(
fieldName,
settings.FormUrlEncodedParameterFormatter.Format(
item,
attrib?.Format
)
);
}

switch (collectionFormat)
break;
case CollectionFormat.Csv:
case CollectionFormat.Ssv:
case CollectionFormat.Tsv:
case CollectionFormat.Pipes:
var delimiter = collectionFormat switch
{
case CollectionFormat.Multi:
foreach (var item in enumerable)
{
Add(
fieldName,
settings.FormUrlEncodedParameterFormatter.Format(
item,
attrib?.Format
)
);
}
break;
case CollectionFormat.Csv:
case CollectionFormat.Ssv:
case CollectionFormat.Tsv:
case CollectionFormat.Pipes:
var delimiter = collectionFormat switch
{
CollectionFormat.Csv => ",",
CollectionFormat.Ssv => " ",
CollectionFormat.Tsv => "\t",
_ => "|"
};

var formattedValues = enumerable
.Cast<object>()
.Select(
v =>
settings.FormUrlEncodedParameterFormatter.Format(
v,
attrib?.Format
)
);
Add(fieldName, string.Join(delimiter, formattedValues));
break;
default:
Add(
fieldName,
CollectionFormat.Csv => ",",
CollectionFormat.Ssv => " ",
CollectionFormat.Tsv => "\t",
_ => "|"
};

var formattedValues = enumerable
.Cast<object>()
.Select(
v =>
settings.FormUrlEncodedParameterFormatter.Format(
value,
v,
attrib?.Format
)
);
break;
}
}
else
{
);
Add(fieldName, string.Join(delimiter, formattedValues));
break;
default:
Add(
fieldName,
settings.FormUrlEncodedParameterFormatter.Format(
value,
attrib?.Format
)
);
}
break;
}
}
}
Expand Down
142 changes: 67 additions & 75 deletions Refit/RequestBuilderImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

partial class RequestBuilderImplementation : IRequestBuilder
{
static readonly ISet<HttpMethod> BodylessMethods = new HashSet<HttpMethod>
static readonly HashSet<HttpMethod> BodylessMethods = new HashSet<HttpMethod>
{
HttpMethod.Get,
HttpMethod.Head
Expand Down Expand Up @@ -74,16 +74,17 @@
{
var attrs = methodInfo.GetCustomAttributes(true);
var hasHttpMethod = attrs.OfType<HttpMethodAttribute>().Any();
if (hasHttpMethod)
{
if (!methods.ContainsKey(methodInfo.Name))
{
methods.Add(methodInfo.Name, new List<RestMethodInfoInternal>());
}
if (!hasHttpMethod)
continue;

var restinfo = new RestMethodInfoInternal(interfaceType, methodInfo, settings);
methods[methodInfo.Name].Add(restinfo);
if (!methods.TryGetValue(methodInfo.Name, out var methodInfoInternals))
{
methodInfoInternals = new List<RestMethodInfoInternal>();
methods.Add(methodInfo.Name, methodInfoInternals);
}

var restinfo = new RestMethodInfoInternal(interfaceType, methodInfo, settings);
methodInfoInternals.Add(restinfo);
}
}

Expand All @@ -93,64 +94,62 @@
Type[]? genericArgumentTypes
)
{
if (interfaceHttpMethods.TryGetValue(key, out var httpMethods))
if (!interfaceHttpMethods.TryGetValue(key, out var httpMethods))
{
throw new ArgumentException(
"Method must be defined and have an HTTP Method attribute"
);

Check warning on line 101 in Refit/RequestBuilderImplementation.cs

View check run for this annotation

Codecov / codecov/patch

Refit/RequestBuilderImplementation.cs#L99-L101 

Added lines #L99 - L101 were not covered by tests
}

if (parameterTypes == null)
{
if (parameterTypes == null)
if (httpMethods.Count > 1)
{
if (httpMethods.Count > 1)
{
throw new ArgumentException(
$"MethodName exists more than once, '{nameof(parameterTypes)}' mut be defined"
);
}
return CloseGenericMethodIfNeeded(httpMethods[0], genericArgumentTypes);
throw new ArgumentException(
$"MethodName exists more than once, '{nameof(parameterTypes)}' mut be defined"
);

Check warning on line 110 in Refit/RequestBuilderImplementation.cs

View check run for this annotation

Codecov / codecov/patch

Refit/RequestBuilderImplementation.cs#L108-L110 

Added lines #L108 - L110 were not covered by tests
}

var isGeneric = genericArgumentTypes?.Length > 0;
return CloseGenericMethodIfNeeded(httpMethods[0], genericArgumentTypes);
}

var possibleMethodsList = httpMethods.Where(
method => method.MethodInfo.GetParameters().Length == parameterTypes.Length
);
var isGeneric = genericArgumentTypes?.Length > 0;

// If it's a generic method, add that filter
if (isGeneric)
possibleMethodsList = possibleMethodsList.Where(
method =>
method.MethodInfo.IsGenericMethod
&& method.MethodInfo.GetGenericArguments().Length
== genericArgumentTypes!.Length
);
else // exclude generic methods
possibleMethodsList = possibleMethodsList.Where(
method => !method.MethodInfo.IsGenericMethod
);
var possibleMethodsList = httpMethods.Where(
method => method.MethodInfo.GetParameters().Length == parameterTypes.Length
);

var possibleMethods = possibleMethodsList.ToList();
// If it's a generic method, add that filter
if (isGeneric)
possibleMethodsList = possibleMethodsList.Where(
method =>
method.MethodInfo.IsGenericMethod
&& method.MethodInfo.GetGenericArguments().Length
== genericArgumentTypes!.Length
);
else // exclude generic methods
possibleMethodsList = possibleMethodsList.Where(
method => !method.MethodInfo.IsGenericMethod
);

if (possibleMethods.Count == 1)
return CloseGenericMethodIfNeeded(possibleMethods[0], genericArgumentTypes);
var possibleMethods = possibleMethodsList.ToList();

var parameterTypesArray = parameterTypes.ToArray();
foreach (var method in possibleMethods)
{
var match = method.MethodInfo
.GetParameters()
.Select(p => p.ParameterType)
.SequenceEqual(parameterTypesArray);
if (match)
{
return CloseGenericMethodIfNeeded(method, genericArgumentTypes);
}
}
if (possibleMethods.Count == 1)
return CloseGenericMethodIfNeeded(possibleMethods[0], genericArgumentTypes);

throw new Exception("No suitable Method found...");
}
else
foreach (var method in possibleMethods)
{
throw new ArgumentException(
"Method must be defined and have an HTTP Method attribute"
);
var match = method.MethodInfo
.GetParameters()
.Select(p => p.ParameterType)
.SequenceEqual(parameterTypes);
if (match)
{
return CloseGenericMethodIfNeeded(method, genericArgumentTypes);
}
}

throw new Exception("No suitable Method found...");

Check warning on line 152 in Refit/RequestBuilderImplementation.cs

View check run for this annotation

Codecov / codecov/patch

Refit/RequestBuilderImplementation.cs#L152 

Added line #L152 was not covered by tests
}

RestMethodInfoInternal CloseGenericMethodIfNeeded(
Expand Down Expand Up @@ -487,19 +486,12 @@
if (obj == null)
continue;

if (parameterInfo != null)
//if we have a parameter info lets check it to make sure it isn't bound to the path
if (parameterInfo is { IsObjectPropertyParameter: true })
{
//if we have a parameter info lets check it to make sure it isn't bound to the path
if (parameterInfo.IsObjectPropertyParameter)
if (parameterInfo.ParameterProperties.Any(x => x.PropertyInfo == propertyInfo))
{
if (
parameterInfo.ParameterProperties.Any(
x => x.PropertyInfo == propertyInfo
)
)
{
continue;
}
continue;
}
}

Expand All @@ -511,7 +503,7 @@

// Look to see if the property has a Query attribute, and if so, format it accordingly
var queryAttribute = propertyInfo.GetCustomAttribute<QueryAttribute>();
if (queryAttribute != null && queryAttribute.Format != null)
if (queryAttribute is { Format: not null })
{
obj = settings.FormUrlEncodedParameterFormatter.Format(
obj,
Expand Down Expand Up @@ -657,9 +649,9 @@
var isParameterMappedToRequest = false;
var param = paramList[i];
// if part of REST resource URL, substitute it in
if (restMethod.ParameterMap.ContainsKey(i))
if (restMethod.ParameterMap.TryGetValue(i, out var parameterMapValue))
{
parameterInfo = restMethod.ParameterMap[i];
parameterInfo = parameterMapValue;
if (parameterInfo.IsObjectPropertyParameter)
{
foreach (var propertyInfo in parameterInfo.ParameterProperties)
Expand All @@ -684,9 +676,9 @@
{
string pattern;
string replacement;
if (restMethod.ParameterMap[i].Type == ParameterType.RoundTripping)
if (parameterMapValue.Type == ParameterType.RoundTripping)
{
pattern = $@"{{\*\*{restMethod.ParameterMap[i].Name}}}";
pattern = $@"{{\*\*{parameterMapValue.Name}}}";
var paramValue = (string)param;
replacement = string.Join(
"/",
Expand All @@ -706,7 +698,7 @@
}
else
{
pattern = "{" + restMethod.ParameterMap[i].Name + "}";
pattern = "{" + parameterMapValue.Name + "}";
replacement = Uri.EscapeDataString(
settings.UrlParameterFormatter.Format(
param,
Expand Down Expand Up @@ -802,9 +794,9 @@
}

// if header, add to request headers
if (restMethod.HeaderParameterMap.ContainsKey(i))
if (restMethod.HeaderParameterMap.TryGetValue(i, out var headerParameterValue))
{
headersToAdd[restMethod.HeaderParameterMap[i]] = param?.ToString();
headersToAdd[headerParameterValue] = param?.ToString();
isParameterMappedToRequest = true;
}

Expand Down Expand Up @@ -1000,7 +992,7 @@
}
}

if (queryParamsToAdd.Any())
if (queryParamsToAdd.Count != 0)
{
var pairs = queryParamsToAdd
.Where(x => x.Key != null && x.Value != null)
Expand Down
Loading