Prefer is for type checking, where possible

Prefer `is` over either `Equals(typeof())` or `IsAssignableFrom()`, assuming a constant type and a positive check.
OnTopicCMS · Dec 8, 2021 · e6bd2b7 · e6bd2b7
1 parent bf469db
commit e6bd2b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/OnTopic/Attributes/AttributeValueConverter.cs b/OnTopic/Attributes/AttributeValueConverter.cs
@@ -128,24 +128,22 @@ internal static class AttributeValueConverter {
       /*------------------------------------------------------------------------------------------------------------------------
       | Handle type-specific rules
       \-----------------------------------------------------------------------------------------------------------------------*/
-      var type                  = value.GetType();
-
-      if (type.Equals(typeof(string))) {
+      if (value is string) {
         return (string)value;
       }
-      else if (type.Equals(typeof(bool)) || type.Equals(typeof(bool?))) {
+      else if (value is bool) {
         return ((bool)value) ? "1" : "0";
       }
-      else if (type.Equals(typeof(int)) || type.Equals(typeof(int?))) {
+      else if (value is int) {
         return ((int)value).ToString(CultureInfo.InvariantCulture);
       }
-      else if (type.Equals(typeof(double)) || type.Equals(typeof(double?))) {
+      else if (value is double) {
         return ((double)value).ToString(CultureInfo.InvariantCulture);
       }
-      else if (type.Equals(typeof(DateTime)) || type.Equals(typeof(DateTime?))) {
+      else if (value is DateTime) {
         return ((DateTime)value).ToString(CultureInfo.InvariantCulture);
       }
-      else if (type.Equals(typeof(Uri))) {
+      else if (value is Uri) {
         return ((Uri)value).ToString();
       }
 

diff --git a/OnTopic/Mapping/TopicMappingService.cs b/OnTopic/Mapping/TopicMappingService.cs
@@ -294,7 +294,7 @@ public class TopicMappingService : ITopicMappingService {
       /*------------------------------------------------------------------------------------------------------------------------
       | Handle topics
       \-----------------------------------------------------------------------------------------------------------------------*/
-      if (typeof(Topic).IsAssignableFrom(target.GetType())) {
+      if (target is Topic) {
         return topic;
       }
 
@@ -856,7 +856,7 @@ MappedTopicCache          cache
         if (
           sourceProperty?.GetValue(source) is IList sourcePropertyValue &&
           sourcePropertyValue.Count > 0 &&
-          typeof(Topic).IsAssignableFrom(sourcePropertyValue[0]?.GetType())
+          sourcePropertyValue[0] is Topic
         ) {
           listSource = getCollection(
             CollectionType.MappedCollection,

diff --git a/OnTopic/Metadata/ContentTypeDescriptorCollection.cs b/OnTopic/Metadata/ContentTypeDescriptorCollection.cs
@@ -79,7 +79,7 @@ public class ContentTypeDescriptorCollection : KeyedTopicCollection<ContentTypeD
       | Add all ContentTypeDescriptors to collection
       \-----------------------------------------------------------------------------------------------------------------------*/
       var contentTypeDescriptors = rootContentType
-        .FindAll(t => typeof(ContentTypeDescriptor).IsAssignableFrom(t.GetType()))
+        .FindAll(t => t is ContentTypeDescriptor)
         .Cast<ContentTypeDescriptor>();
       foreach (var contentType in contentTypeDescriptors) {
         Add((ContentTypeDescriptor)contentType);

diff --git a/OnTopic/Querying/TopicExtensions.cs b/OnTopic/Querying/TopicExtensions.cs
@@ -288,7 +288,7 @@ public static class TopicExtensions {
       \-----------------------------------------------------------------------------------------------------------------------*/
       var contentTypeDescriptor = rootContentType?.FindFirst(t =>
         t.Key.Equals(topic.ContentType, StringComparison.OrdinalIgnoreCase) &&
-        t.GetType().IsAssignableFrom(typeof(ContentTypeDescriptor))
+        t is ContentTypeDescriptor
       ) as ContentTypeDescriptor;
 
       /*------------------------------------------------------------------------------------------------------------------------