IGNITE-14804 .NET: Fix static analysis warnings
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
index 0537ef1..cbd3d57 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
@@ -133,7 +133,7 @@
/// <summary>
/// Writes new element.
/// </summary>
- private static void WriteElement(object obj, XmlWriter writer, string rootElementName, Type valueType,
+ private static void WriteElement(object obj, XmlWriter writer, string rootElementName, Type valueType,
PropertyInfo property = null, bool writeSchema = false)
{
if (property != null)
@@ -215,7 +215,7 @@
writer.WriteAttributeString(TypNameAttribute, TypNameNull);
return;
}
-
+
var props = GetNonDefaultProperties(obj).OrderBy(x => x.Name).ToList();
var realType = obj.GetType();
@@ -285,7 +285,7 @@
/// <summary>
/// Reads the property value.
/// </summary>
- private static object ReadPropertyValue(XmlReader reader, TypeResolver resolver,
+ private static object ReadPropertyValue(XmlReader reader, TypeResolver resolver,
PropertyInfo prop, Type targetType)
{
var propType = prop.PropertyType;
@@ -325,7 +325,7 @@
/// <summary>
/// Reads the complex property (nested object).
/// </summary>
- private static object ReadComplexProperty(XmlReader reader, Type propType, string propName, Type targetType,
+ private static object ReadComplexProperty(XmlReader reader, Type propType, string propName, Type targetType,
TypeResolver resolver)
{
propType = ResolvePropertyType(reader, propType, propName, targetType, resolver);
@@ -390,7 +390,7 @@
/// <summary>
/// Reads the collection.
/// </summary>
- private static IList ReadCollectionProperty(XmlReader reader, PropertyInfo prop, Type targetType,
+ private static IList ReadCollectionProperty(XmlReader reader, PropertyInfo prop, Type targetType,
TypeResolver resolver)
{
var elementType = prop.PropertyType.GetGenericArguments().Single();
@@ -422,7 +422,7 @@
return list;
}
-
+
/// <summary>
/// Reads the dictionary.
/// </summary>
@@ -586,6 +586,7 @@
var converter = TypeDescriptor.GetConverter(propertyType);
+ // ReSharper disable once ConditionIsAlwaysTrueOrFalse (null is possible with custom type descriptors)
if (converter == null || !converter.CanConvertFrom(typeof(string)) ||
!converter.CanConvertTo(typeof(string)))
throw new ConfigurationErrorsException("No converter for type " + propertyType);
diff --git a/modules/platforms/dotnet/Apache.Ignite.Linq/Impl/Dml/UpdateAllExpressionNode.cs b/modules/platforms/dotnet/Apache.Ignite.Linq/Impl/Dml/UpdateAllExpressionNode.cs
index 8cfb552..f9e2a11 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Linq/Impl/Dml/UpdateAllExpressionNode.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Linq/Impl/Dml/UpdateAllExpressionNode.cs
@@ -84,13 +84,14 @@
var querySourceAccessValue =
Expression.MakeMemberAccess(querySourceRefExpression, cacheEntryType.GetMember("Value").First());
- if (!(_updateDescription.Body is MethodCallExpression))
+ var methodCall = _updateDescription.Body as MethodCallExpression;
+
+ if (methodCall == null)
throw new NotSupportedException("Expression is not supported for UpdateAll: " +
_updateDescription.Body);
var updates = new List<MemberUpdateContainer>();
- var methodCall = (MethodCallExpression) _updateDescription.Body;
while (methodCall != null)
{
if (methodCall.Arguments.Count != 2)
@@ -135,4 +136,4 @@
return SupportedMethods;
}
}
-}
\ No newline at end of file
+}
