From d3aa20b03cfec31ab8db9b85eb0d357dbc36cd46 Mon Sep 17 00:00:00 2001
From: Alessio Parma <alessio.parma@gmail.com>
Date: Sat, 24 Jun 2017 09:30:46 +0200
Subject: [PATCH] restored equality members

---
 .gitignore                                    |  6 ++
 .../Core/PooledObjectInfo.cs                  | 63 +++++++++++++-
 src/CodeProject.ObjectPool/PooledObject.cs    | 87 ++++++++++++-------
 3 files changed, 123 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ea4e1a..224ca86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -215,3 +215,9 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+#############
+## Rider
+#############
+
+.idea
diff --git a/src/CodeProject.ObjectPool/Core/PooledObjectInfo.cs b/src/CodeProject.ObjectPool/Core/PooledObjectInfo.cs
index 6518559..6dd6e7c 100644
--- a/src/CodeProject.ObjectPool/Core/PooledObjectInfo.cs
+++ b/src/CodeProject.ObjectPool/Core/PooledObjectInfo.cs
@@ -21,12 +21,14 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
 // OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+using System;
+
 namespace CodeProject.ObjectPool.Core
 {
     /// <summary>
     ///   Core information about a specific <see cref="PooledObject"/>.
     /// </summary>
-    public sealed class PooledObjectInfo
+    public sealed class PooledObjectInfo : IEquatable<PooledObjectInfo>
     {
         /// <summary>
         ///   An identifier which is unique inside the pool to which this object belongs. Moreover,
@@ -50,5 +52,64 @@ public sealed class PooledObjectInfo
         ///   that object to re-add itself back to the pool.
         /// </summary>
         internal IObjectPoolHandle Handle { get; set; }
+
+        /// <summary>
+        ///   Returns a string that represents the current object.
+        /// </summary>
+        /// <returns>A string that represents the current object.</returns>
+        public override string ToString() => $"{nameof(Id)}: {Id}, {nameof(Payload)}: {Payload}";
+
+        /// <summary>
+        ///   Indicates whether the current object is equal to another object of the same type.
+        /// </summary>
+        /// <returns>
+        ///   true if the current object is equal to the <paramref name="other"/> parameter;
+        ///   otherwise, false.
+        /// </returns>
+        /// <param name="other">An object to compare with this object.</param>
+        public bool Equals(PooledObjectInfo other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Id == other.Id;
+        }
+
+        /// <summary>
+        ///   Determines whether the specified <see cref="object"/> is equal to the current <see cref="PooledObjectInfo"/>.
+        /// </summary>
+        /// <returns>
+        ///   true if the specified <see cref="object"/> is equal to the current
+        ///   <see cref="PooledObjectInfo"/>; otherwise, false.
+        /// </returns>
+        /// <param name="obj">The <see cref="object"/> to compare with the current <see cref="PooledObjectInfo"/>.</param>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            var info = obj as PooledObjectInfo;
+            return info != null && Equals(info);
+        }
+
+        /// <summary>
+        ///   Serves as a hash function for a particular type.
+        /// </summary>
+        /// <returns>A hash code for the current <see cref="PooledObjectInfo"/>.</returns>
+        public override int GetHashCode() => Id;
+
+        /// <summary>
+        ///   Compares to pooled objects info by <see cref="Id"/>.
+        /// </summary>
+        /// <param name="left">Left object.</param>
+        /// <param name="right">Right object.</param>
+        /// <returns>True if given pooled objects info are equal, false otherwise.</returns>
+        public static bool operator ==(PooledObjectInfo left, PooledObjectInfo right) => Equals(left, right);
+
+        /// <summary>
+        ///   Compares to pooled objects info by <see cref="Id"/>.
+        /// </summary>
+        /// <param name="left">Left object.</param>
+        /// <param name="right">Right object.</param>
+        /// <returns>True if given pooled objects info are not equal, false otherwise.</returns>
+        public static bool operator !=(PooledObjectInfo left, PooledObjectInfo right) => !Equals(left, right);
     }
 }
\ No newline at end of file
diff --git a/src/CodeProject.ObjectPool/PooledObject.cs b/src/CodeProject.ObjectPool/PooledObject.cs
index b0d57b3..cc800da 100644
--- a/src/CodeProject.ObjectPool/PooledObject.cs
+++ b/src/CodeProject.ObjectPool/PooledObject.cs
@@ -192,41 +192,64 @@ private void HandleReAddingToPool(bool reRegisterForFinalization)
 
         #region Formatting and equality
 
-        ///// <summary>
-        /////   Returns all property (or field) values, along with their names, so that they can be
-        /////   used to produce a meaningful <see cref="object.ToString"/>.
-        ///// </summary>
-        ///// <returns>
-        /////   All property (or field) values, along with their names, so that they can be used to
-        /////   produce a meaningful <see cref="object.ToString"/>.
-        ///// </returns>
-        //protected override IEnumerable<KeyValuePair<string, object>> GetFormattingMembers()
-        //{
-        //    yield return new KeyValuePair<string, object>(nameof(PooledObjectInfo.Id), PooledObjectInfo.Id);
-        //    if (PooledObjectInfo.Payload != null)
-        //    {
-        //        yield return new KeyValuePair<string, object>(nameof(PooledObjectInfo.Payload), PooledObjectInfo.Payload);
-        //    }
-        //}
-
-        ///// <summary>
-        /////   Returns all property (or field) values that should be used inside
-        /////   <see cref="IEquatable{T}.Equals(T)"/> or <see cref="object.GetHashCode"/>.
-        ///// </summary>
-        ///// <returns>
-        /////   All property (or field) values that should be used inside
-        /////   <see cref="IEquatable{T}.Equals(T)"/> or <see cref="object.GetHashCode"/>.
-        ///// </returns>
-        //protected override IEnumerable<object> GetIdentifyingMembers()
-        //{
-        //    yield return PooledObjectInfo.Id;
-        //}
-
-        public bool Equals(PooledObject other)
+        /// <summary>
+        ///   Returns a string that represents the current object.
+        /// </summary>
+        /// <returns>A string that represents the current object.</returns>
+        public override string ToString() => PooledObjectInfo.ToString();
+
+        /// <summary>
+        ///   Indicates whether the current object is equal to another object of the same type.
+        /// </summary>
+        /// <returns>
+        ///   true if the current object is equal to the <paramref name="other"/> parameter;
+        ///   otherwise, false.
+        /// </returns>
+        /// <param name="other">An object to compare with this object.</param>
+        public virtual bool Equals(PooledObject other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return PooledObjectInfo.Equals(other.PooledObjectInfo);
+        }
+
+        /// <summary>
+        ///   Determines whether the specified <see cref="object"/> is equal to the current <see cref="PooledObject"/>.
+        /// </summary>
+        /// <returns>
+        ///   true if the specified <see cref="object"/> is equal to the current
+        ///   <see cref="PooledObject"/>; otherwise, false.
+        /// </returns>
+        /// <param name="obj">The <see cref="object"/> to compare with the current <see cref="PooledObject"/>.</param>
+        public override bool Equals(object obj)
         {
-            throw new NotImplementedException();
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            return obj.GetType() == GetType() && Equals(obj as PooledObject);
         }
 
+        /// <summary>
+        ///   Serves as a hash function for a particular type.
+        /// </summary>
+        /// <returns>A hash code for the current <see cref="PooledObject"/>.</returns>
+        public override int GetHashCode() => PooledObjectInfo.GetHashCode();
+
+        /// <summary>
+        ///   Compares to pooled objects.
+        /// </summary>
+        /// <param name="left">Left object.</param>
+        /// <param name="right">Right object.</param>
+        /// <returns>True if given pooled objects are equal, false otherwise.</returns>
+        public static bool operator ==(PooledObject left, PooledObject right) => Equals(left, right);
+
+        /// <summary>
+        ///   Compares to pooled objects.
+        /// </summary>
+        /// <param name="left">Left object.</param>
+        /// <param name="right">Right object.</param>
+        /// <returns>True if given pooled objects are not equal, false otherwise.</returns>
+        public static bool operator !=(PooledObject left, PooledObject right) => !Equals(left, right);
+
         #endregion Formatting and equality
     }
 }
\ No newline at end of file