Skip to content

fixed boolean or converter so that it handles boolean values, as well… #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2019
Merged

fixed boolean or converter so that it handles boolean values, as well… #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Protocol/Models/BooleanOr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public BooleanOr(bool value)
_bool = value;
}

public bool IsValue => this._value != null;
public bool IsValue => this._value != default;
public T Value
{
get { return this._value; }
Expand Down
16 changes: 4 additions & 12 deletions src/Protocol/Serialization/Converters/BooleanOrConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,15 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s

private static void WriteJsonGeneric<T>(JsonWriter writer, BooleanOr<T> value, JsonSerializer serializer)
{
if (value.IsValue)
if (value.IsBool)
{
if (typeof(T).IsValueType)
{
new JValue(value.Value).WriteTo(writer);
}
else
{
serializer.Serialize(writer, value.Value);
}

new JValue(value.Bool).WriteTo(writer);
return;
}

if (value.IsBool)
if (value.IsValue)
{
new JValue(value.Bool).WriteTo(writer);
serializer.Serialize(writer, value.Value);
return;
}

Expand Down