Skip to content

Commit

Permalink
C# 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zlatanov committed Jun 30, 2021
1 parent a5d7967 commit 48ba5b8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<Authors>Ivan Zlatanov</Authors>
<NeutralLanguage>en-US</NeutralLanguage>
<LangVersion>8.0</LangVersion>
<LangVersion>9.0</LangVersion>
<Features>strict</Features>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
16 changes: 8 additions & 8 deletions src/Serialization/JsonProperty`TOwner+TProperty.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ public JsonProperty( JsonObjectContract<TOwner> parent, MemberInfo member ) : ba
m_setter = CreateSetter( member );
m_getter = ReflectionHelpers.CreateGetter<TOwner, TProperty, Getter>( member );

if ( m_getter is object )
if ( m_getter is not null )
{
ShouldSerialize = CreateShouldSerialize( member );
}

CanSetValue = m_setter is object;
CanGetValue = m_getter is object;
CanSetValue = m_setter is not null;
CanGetValue = m_getter is not null;

Debug.Assert( PropertyType == typeof( TProperty ) );
}
Expand All @@ -49,7 +49,7 @@ public JsonProperty( JsonObjectContract<TOwner> parent, MemberInfo member ) : ba

protected internal override void WriteValue( JsonWriter writer, TOwner owner )
{
if ( ShouldSerialize is object && !ShouldSerialize( owner ) )
if ( ShouldSerialize is not null && !ShouldSerialize( owner ) )
{
return;
}
Expand All @@ -63,7 +63,7 @@ protected internal override void WriteValue( JsonWriter writer, TOwner owner )

writer.WritePropertyName( Name );

if ( Converter is object )
if ( Converter is not null )
{
// Try to avoid boxing if possible
if ( IsValueType && Converter is JsonConverter<TProperty> valueConverter )
Expand Down Expand Up @@ -105,7 +105,7 @@ internal override unsafe void ReadValue( JsonReader reader, ref TOwner target, b
{
var currentValue = m_getter( target );

if ( currentValue is object )
if ( currentValue is not null )
{
reader.Populate( currentValue );
propertyValues.MarkAsPresent( this );
Expand All @@ -117,7 +117,7 @@ internal override unsafe void ReadValue( JsonReader reader, ref TOwner target, b
value = reader.ReadValue<TProperty>();
}

if ( targetCreated && m_setter is object )
if ( targetCreated && m_setter is not null )
{
m_setter( ref target, value );
propertyValues.MarkAsPresent( this );
Expand Down Expand Up @@ -186,7 +186,7 @@ private static Predicate<TOwner> CreateShouldSerialize( MemberInfo member )
var flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
var method = typeof( TOwner ).GetMethod( "ShouldSerialize" + member.Name, flags, null, Type.EmptyTypes, null );

if ( method is object && method.ReturnType == typeof( Boolean ) )
if ( method is not null && method.ReturnType == typeof( Boolean ) )
{
return (Predicate<TOwner>)method.CreateDelegate( typeof( Predicate<TOwner> ) );
}
Expand Down

0 comments on commit 48ba5b8

Please sign in to comment.