Skip to content

NameValueListBase key "not null" constraint removed #4862

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

Open
StefanOssendorf wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −19
Open

NameValueListBase key "not null" constraint removed #4862

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
28 changes: 9 additions & 19 deletions Source/Csla/NameValueListBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public abstract class NameValueListBase<[DynamicallyAccessedMembers(DynamicallyA
ICloneable,
IDataPortalTarget,
IUseApplicationContext
where K: notnull
where V: notnull
{
/// <summary>
Expand All @@ -56,14 +55,10 @@ ApplicationContext IUseApplicationContext.ApplicationContext
/// specified key.
/// </summary>
/// <param name="key">Key value for which to retrieve a value.</param>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
public V? Value(K key)
{
if(key is null)
throw new ArgumentNullException(nameof(key));

foreach (NameValuePair item in this)
if (item.Key.Equals(key))
if (KeysEqual(item.Key, key))
return item.Value;
return default(V);
}
Expand Down Expand Up @@ -91,14 +86,10 @@ ApplicationContext IUseApplicationContext.ApplicationContext
/// specified key.
/// </summary>
/// <param name="key">Key value for which to search.</param>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
public bool ContainsKey(K key)
{
if (key is null)
throw new ArgumentNullException(nameof(key));

foreach (NameValuePair item in this)
if (item.Key.Equals(key))
if (KeysEqual(item.Key, key))
return true;
return false;
}
Expand Down Expand Up @@ -154,15 +145,11 @@ public bool ContainsValue(V value)
/// Key to search for in the list.
/// </param>
/// <returns>Item from the list.</returns>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
public NameValuePair? GetItemByKey(K key)
{
if (key is null)
throw new ArgumentNullException(nameof(key));

foreach (NameValuePair item in this)
{
if (item != null && item.Key.Equals(key))
if (KeysEqual(item.Key, key))
{
return item;
}
Expand All @@ -171,6 +158,11 @@ public bool ContainsValue(V value)

}

private static bool KeysEqual(K key1, K key2)
{
return EqualityComparer<K>.Default.Equals(key1, key2);
}

#endregion

/// <summary>
Expand Down Expand Up @@ -227,11 +219,9 @@ public NameValuePair()
/// </summary>
/// <param name="key">The key.</param>
/// <param name="value">The value.</param>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
/// <exception cref="ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
public NameValuePair(K key, V value)
{
if (key is null)
throw new ArgumentNullException(nameof(key));
if (value is null)
throw new ArgumentNullException(nameof(value));

Expand Down
13 changes: 13 additions & 0 deletions Source/tests/csla.netcore.test/Basic/NullableKeyValueList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Csla.Test.Basic;

/// <summary>
/// Example that a nullable key is now possible for <see cref="NameValueListBase{K,V}"/>.
/// </summary>
public class NullableKeyValueList : NameValueListBase<int?, string>
{
[Fetch]
private void Fetch()
{
// This class must be compilable.
}
}
Loading