Update TypeNameResolver.cs (#3393)

msarilar · Mpdreamz · commit e1daca0a92ab · 2018-09-10T12:15:10.000+02:00
(cherry picked from commit ed4205c)
diff --git a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs
@@ -39,9 +39,7 @@ private string ResolveType(Type type)
 			else
 			{
 				var dataContract = type.GetAttributes<DataContractAttribute>().FirstOrDefault();
-				typeName = dataContract != null
-					? dataContract.Name
-					: _connectionSettings.DefaultTypeNameInferrer(type);
+				typeName = dataContract?.Name ?? _connectionSettings.DefaultTypeNameInferrer(type);
 			}
 			if (typeName.IsNullOrEmpty()) throw new ArgumentNullException($"{type.FullName} resolved to an empty string or null");
 

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,7 @@ private string ResolveType(Type type)`
`39`	`39`	`else`
`40`	`40`	`{`
`41`	`41`	`var dataContract = type.GetAttributes<DataContractAttribute>().FirstOrDefault();`
`42`		`- typeName = dataContract != null`
`43`		`- ? dataContract.Name`
`44`		`- : _connectionSettings.DefaultTypeNameInferrer(type);`
	`42`	`+ typeName = dataContract?.Name ?? _connectionSettings.DefaultTypeNameInferrer(type);`
`45`	`43`	`}`
`46`	`44`	`if (typeName.IsNullOrEmpty()) throw new ArgumentNullException($"{type.FullName} resolved to an empty string or null");`
`47`	`45`