total rewrite

Author: Ryddag

src/Interface/ICachedContainer.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace ProjectCeleste.Misc.Container.Interface
+{
+    public interface IConcurrentContainer<in TKey, TValue> : IContainer<TKey, TValue>
+    {
+        [CanBeNull]
+        [Pure]
+        TValue Get([NotNull] Func<TValue, bool> criteria, bool useCache = true);
+
+        [NotNull]
+        [ItemNotNull]
+        [Pure]
+        IEnumerable<TValue> Gets(bool dirtyRead = true);
+
+        [NotNull]
+        [ItemNotNull]
+        [Pure]
+        IEnumerable<TValue> Gets([NotNull] Func<TValue, bool> criteria, bool dirtyRead = true);
+    }
+}

src/Interface/IConcurrentContainer.cs

@@ -1,13 +1,16 @@
-namespace ProjectCeleste.Misc.Container.Interface
+using System;
+using JetBrains.Annotations;
+
+namespace ProjectCeleste.Misc.Container.Interface
 {
     public interface IContainer<in TKey, TValue> : IReadOnlyContainer<TKey, TValue>
     {
-        bool Add(TValue value);
+        bool Add([NotNull] TValue value);
         void Clear();
-        bool Remove(TKey key);
-        bool Remove(TKey key, out TValue value);
+        bool Remove([NotNull] TKey key);
+        bool Remove([NotNull] TKey key, out TValue value);
 
-        bool Update(TValue value);
+        bool Update([NotNull] TValue value, [CanBeNull] Func<TValue, TValue, bool> equalityComparer = null);
         //bool ChangeKey(T1 newKey, T1 oldKey);
     }
 }

src/Interface/IContainer.cs

@@ -0,0 +1,7 @@
+namespace ProjectCeleste.Misc.Container.Interface
+{
+    public interface IObservableConcurrentContainer<in TKey, TValue> : IConcurrentContainer<TKey, TValue>,
+        IObservableContainer<TKey, TValue>
+    {
+    }
+}

src/Interface/IObservableConcurrentContainer.cs

@@ -1,17 +1,34 @@
 using System;
 using System.Collections.Generic;
-using ProjectCeleste.Misc.Container.Misc;
+using JetBrains.Annotations;
 
 namespace ProjectCeleste.Misc.Container.Interface
 {
-    public interface IReadOnlyContainer<in TKey, out TValue> : IEnumerable<TValue>, IContainerJsonConverter
+    public interface IReadOnlyContainer<in TKey, out TValue>
     {
-        TValue this[TKey key] { get; }
+        [NotNull] TValue this[[NotNull] TKey key] { get; }
+
         int Count { get; }
-        bool ContainsKey(TKey key);
-        TValue Get(Func<TValue, bool> criteria);
-        TValue Get(TKey key);
+
+        [Pure]
+        bool ContainsKey([NotNull] TKey key);
+
+        [CanBeNull]
+        [Pure]
+        TValue Get([NotNull] Func<TValue, bool> criteria);
+
+        [CanBeNull]
+        [Pure]
+        TValue Get([NotNull] TKey key);
+
+        [NotNull]
+        [ItemNotNull]
+        [Pure]
         IEnumerable<TValue> Gets();
-        IEnumerable<TValue> Gets(Func<TValue, bool> criteria);
+
+        [NotNull]
+        [ItemNotNull]
+        [Pure]
+        IEnumerable<TValue> Gets([NotNull] Func<TValue, bool> criteria);
     }
 }