Skip to content

StringValues Add IsNull, always set single item to _value #323

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
halter73 merged 6 commits into from
Mar 20, 2018
Merged

StringValues Add IsNull, always set single item to _value #323

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af93739
StringValues Add IsNull, always set single item to _value
benaadams Mar 1, 2018
e9d8567
Revert formatting
benaadams Mar 15, 2018
74e7888
Add comment
benaadams Mar 16, 2018
6a5e5f1
Remove nulls from arrays
benaadams Mar 18, 2018
fb8e5fe
Revert "Remove nulls from arrays"
benaadams Mar 20, 2018
9152086
feedback
benaadams Mar 20, 2018
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
67 changes: 34 additions & 33 deletions src/Microsoft.Extensions.Primitives/StringValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,23 @@ public StringValues(string value)

public StringValues(string[] values)
{
_value = null;
_values = values;
if (values == null || values.Length == 0)
Copy link
Copy Markdown
Member

@halter73 halter73 Mar 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a comment explaining that if _values isn't set to null when values.Length is zero, the IsNull property will be broken.

Copy link
Copy Markdown
Member Author

@benaadams benaadams Mar 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

{
// Set null and empty arrays to null
_value = null; // Both null is required for
_values = null; // IsNull property to work correctly
}
else if (values.Length == 1)
{
// Set single item arrays to the string value
_values = null;
_value = values[0];
}
else
{
_value = null;
_values = values;
}
}

public static implicit operator StringValues(string value)
Expand All @@ -53,6 +68,8 @@ public static implicit operator string[] (StringValues value)

public int Count => _value != null ? 1 : (_values?.Length ?? 0);

public bool IsNull => _value == null && _values == null;

bool ICollection<string>.IsReadOnly
{
get { return true; }
Expand Down Expand Up @@ -85,19 +102,7 @@ public override string ToString()
return GetStringValue() ?? string.Empty;
}

private string GetStringValue()
{
if (_values == null)
{
return _value;
}
switch (_values.Length)
{
case 0: return null;
case 1: return _values[0];
default: return string.Join(",", _values);
}
}
private string GetStringValue() => (_values == null) ? _value : string.Join(",", _values);

public string[] ToArray()
{
Expand Down Expand Up @@ -225,29 +230,25 @@ public static bool IsNullOrEmpty(StringValues value)
{
return string.IsNullOrEmpty(value._value);
}
switch (value._values.Length)
{
case 0: return true;
case 1: return string.IsNullOrEmpty(value._values[0]);
default: return false;
}

return false;
}

public static StringValues Concat(StringValues values1, StringValues values2)
{
var count1 = values1.Count;
var count2 = values2.Count;

if (count1 == 0)
if (values1.IsNull)
{
return values2;
}

if (count2 == 0)
if (values2.IsNull)
{
return values1;
}

var count1 = values1.Count;
var count2 = values2.Count;
var combined = new string[count1 + count2];
values1.CopyTo(combined, 0);
values2.CopyTo(combined, count1);
Expand All @@ -261,12 +262,12 @@ public static StringValues Concat(in StringValues values, string value)
return values;
}

var count = values.Count;
if (count == 0)
if (values.IsNull)
{
return new StringValues(value);
}

var count = values.Count;
var combined = new string[count + 1];
values.CopyTo(combined, 0);
combined[count] = value;
Expand All @@ -280,12 +281,12 @@ public static StringValues Concat(string value, in StringValues values)
return values;
}

var count = values.Count;
if (count == 0)
if (values.IsNull)
{
return new StringValues(value);
}

var count = values.Count;
var combined = new string[count + 1];
combined[0] = value;
values.CopyTo(combined, 1);
Expand Down Expand Up @@ -420,12 +421,12 @@ public override bool Equals(object obj)
{
if (obj == null)
{
return Equals(this, StringValues.Empty);
return this.IsNull;
}

if (obj is string)
if (obj is string str)
{
return Equals(this, (string)obj);
return this._value == str;
}

if (obj is string[])
Expand Down Expand Up @@ -514,4 +515,4 @@ public void Dispose()
}
}
}
}
}