Review.

Gremlinq · Jan 12, 2021 · f2393fe · f2393fe
1 parent 1445673
commit f2393fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/ExRam.Gremlinq.Core/Environment/GremlinQueryEnvironment.cs b/src/ExRam.Gremlinq.Core/Environment/GremlinQueryEnvironment.cs
@@ -107,18 +107,12 @@ public static IGremlinQueryEnvironment StoreTimeSpansAsNumbers(this IGremlinQuer
             return environment
                 .ConfigureSerializer(serializer => serializer
                     .ConfigureFragmentSerializer(fragmentSerializer =>  fragmentSerializer
-                        .Override<TimeSpan>((t, env, overridden, recurse) =>
-                        {
-                            return recurse.Serialize(t.TotalMilliseconds, env);
-                        })))
+                        .Override<TimeSpan>((t, env, overridden, recurse) => recurse.Serialize(t.TotalMilliseconds, env))))
                 .ConfigureDeserializer(deserializer => deserializer
                     .ConfigureFragmentDeserializer(fragmentDeserializer => fragmentDeserializer
-                        .Override<JValue>((jValue, type, env, overridden, recurse) =>
-                        {
-                            return type == typeof(TimeSpan)
-                                ? TimeSpan.FromMilliseconds(jValue.Value<double>())
-                                : overridden(jValue, type, env, recurse);
-                        })));
+                        .Override<JValue>((jValue, type, env, overridden, recurse) => type == typeof(TimeSpan)
+                            ? TimeSpan.FromMilliseconds(jValue.Value<double>())
+                            : overridden(jValue, type, env, recurse))));
         }
     }
 }
diff --git a/src/ExRam.Gremlinq.Core/Extensions/ObjectExtensions.cs b/src/ExRam.Gremlinq.Core/Extensions/ObjectExtensions.cs
@@ -61,6 +61,7 @@ public static object GetId(this object element, IGremlinQueryEnvironment environ
             var (propertyInfo, _, _) = environment.GetCache().GetSerializationData(element.GetType())
                 .FirstOrDefault(info => info.key.RawKey is T t && T.Id.Equals(t));
 
+            // ReSharper disable once ConstantConditionalAccessQualifier
             return propertyInfo?.GetValue(element) is { } value
                 ? value
                 : throw new InvalidOperationException($"Unable to determine Id for {element}");

diff --git a/test/ExRam.Gremlinq.Core.Tests/QueryExecutionTest.cs b/test/ExRam.Gremlinq.Core.Tests/QueryExecutionTest.cs
@@ -2735,7 +2735,7 @@ await _g
                     .V<Company>()
                     .Properties(x => x.Locations!)
                     .Properties()
-                    .Where(x => x.Key! == stepLabel))
+                    .Where(x => x.Key == stepLabel))
                 .Verify(this);
         }
 
@@ -2914,7 +2914,7 @@ await _g
                 .As((__, l) => __
                     .V<Country>()
                     .Properties(x => x.Languages!)
-                    .Where(x => x.Label! == l))
+                    .Where(x => x.Label == l))
                 .Verify(this);
         }