Made entity equal to use id equal

Made path equal to check start node equal and each relationship equal
Some changes in Config:
Renamed `IdleSessionPoolSize` to `MaxIdleSessionPoolSize`
Changed `WithEncryptionEnabled(bool)` to `WithEncryptionLevel(EncryptionLevel)`

Author: Zhen Li

Neo4j.Driver/Neo4j.Driver.IntegrationTests/Examples.cs

@@ -275,7 +275,7 @@ public void ResultSummaryNotifications()
         public void TlsRequireEncryption()
         {
             //tag::tls-require-encryption[]
-            var driver = GraphDatabase.Driver("bolt://localhost:7687", Config.Builder.WithTlsEnabled(true).ToConfig());
+            var driver = GraphDatabase.Driver("bolt://localhost:7687", Config.Builder.WithEncryptionLevel(EncryptionLevel.Encrypted).ToConfig());
             //end::tls-require-encryption[]
             driver.Dispose();
         }
@@ -284,7 +284,7 @@ public void TlsRequireEncryption()
         public void TlsSigned()
         {
             //tag::tls-signed[]
-            var driver = GraphDatabase.Driver("bolt://localhost:7687", Config.Builder.WithTlsEnabled(true).ToConfig());
+            var driver = GraphDatabase.Driver("bolt://localhost:7687", Config.Builder.WithEncryptionLevel(EncryptionLevel.Encrypted).ToConfig());
             //end::tls-signed[]
             driver.Dispose();
         }

Neo4j.Driver/Neo4j.Driver.Tck.Tests/TCK/TypeSystem.feature.steps.cs

@@ -110,7 +110,7 @@ public static void GlobalBeforeScenario()
                 throw;
             }
             var config = Config.DefaultConfig;
-            config.IdleSessionPoolSize = Config.InfiniteIdleSessionPoolSize;
+            config.MaxIdleSessionPoolSize = Config.InfiniteMaxIdleSessionPoolSize;
             Driver = GraphDatabase.Driver(Url, config);
         }
 

Neo4j.Driver/Neo4j.Driver.Tests/EntityTests.cs

@@ -0,0 +1,68 @@
+//  Copyright (c) 2002-2016 "Neo Technology,"
+//  Network Engine for Objects in Lund AB [http://neotechnology.com]
+// 
+//  This file is part of Neo4j.
+// 
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+using FluentAssertions;
+using Neo4j.Driver.Internal;
+using Xunit;
+
+namespace Neo4j.Driver.Tests
+{
+    public class EntityTests
+    {
+        public class NodeTests
+        {
+            [Fact]
+            public void ShouldEqualIfIdEquals()
+            {
+                var node1 = new Node(123, new []{"buibui"}, null);
+                var node2 = new Node(123, new []{"lala"}, null);
+                node1.Equals(node2).Should().BeTrue();
+                Equals(node1, node2).Should().BeTrue();
+                node1.GetHashCode().Should().Be(node2.GetHashCode());
+            }
+        }
+
+        public class RelationshipTests
+        {
+            [Fact]
+            public void ShouldEqualIfIdEquals()
+            {
+                var rel1 = new Relationship(123, 000, 111, "buibui", null);
+                var rel2 = new Relationship(123, 222, 333, "lala", null);
+                rel1.Equals(rel2).Should().BeTrue();
+                Equals(rel1, rel2).Should().BeTrue();
+                rel1.GetHashCode().Should().Be(rel2.GetHashCode());
+            }
+        }
+
+        public class PathTests
+        {
+            [Fact]
+            public void ShouldEqualIfIdEquals()
+            {
+                var path1 = new Path(null, 
+                    new []{ new Node(123, new []{"buibui"}, null) },
+                    new []{ new Relationship(1, 000, 111, "buibui", null)});
+                var path2 = new Path(null, 
+                    new[] { new Node(123, new[] { "lala" }, null) },
+                    new []{ new Relationship(1, 222, 333, "lala", null)});
+                path1.Equals(path2).Should().BeTrue();
+                Equals(path1, path2).Should().BeTrue();
+                path1.GetHashCode().Should().Be(path2.GetHashCode());
+            }
+        }
+    }
+}

Neo4j.Driver/Neo4j.Driver.Tests/Neo4j.Driver.Tests.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Connector\ChunkedOutputTest.cs" />
     <Compile Include="Connector\MessageResponseHandlerTests.cs" />
     <Compile Include="DriverTests.cs" />
+    <Compile Include="EntityTests.cs" />
     <Compile Include="Messaging\MessageTests.cs" />
     <Compile Include="Result\ResultBuilderTests.cs" />
     <Compile Include="SessionPoolTests.cs" />

Neo4j.Driver/Neo4j.Driver.Tests/SessionPoolTests.cs

@@ -43,7 +43,7 @@ public GetSessionMethod(ITestOutputHelper output)
             public void ShouldNotThrowExceptionWhenIdlePoolSizeReached()
             {
                 var mock = new Mock<IConnection>();
-                var config = new Config {IdleSessionPoolSize = 2};
+                var config = new Config {MaxIdleSessionPoolSize = 2};
                 var pool = new SessionPool(TestUri, AuthTokens.None, null, config, mock.Object);
                 pool.GetSession();
                 pool.GetSession();
@@ -60,7 +60,7 @@ public void ShouldNotExceedIdleLimit()
                 var mock = new Mock<IConnection>();
                 mock.Setup(x => x.IsOpen).Returns(true);
 
-                var config = new Config {IdleSessionPoolSize = 2};
+                var config = new Config {MaxIdleSessionPoolSize = 2};
                 var pool = new SessionPool(TestUri, AuthTokens.None, null, config, mock.Object);
 
                 var sessions = new List<ISession>();
@@ -85,7 +85,7 @@ public void ShouldGiveSessionsFromPoolIfAvailable()
                 var mock = new Mock<IConnection>();
                 mock.Setup(x => x.IsOpen).Returns(true);
 
-                var config = new Config {IdleSessionPoolSize = 2};
+                var config = new Config {MaxIdleSessionPoolSize = 2};
                 var pool = new SessionPool(TestUri, AuthTokens.None, null, config, mock.Object);
 
                 for (var i = 0; i < 4; i++)

Neo4j.Driver/Neo4j.Driver/Config.cs

@@ -19,22 +19,31 @@
 
 namespace Neo4j.Driver
 {
+    /// <summary>
+    /// Control the level of encryption to require.
+    /// </summary>
+    public enum EncryptionLevel
+    {
+        None,
+        Encrypted
+    }
+
     /// <summary>
     /// Use this class to config the <see cref="Driver"/> in a certain way
     /// </summary>
     public class Config
     {
         /// <summary>
-        /// When the <see cref="IdleSessionPoolSize"/> is set to <see cref="InfiniteIdleSessionPoolSize" /> the idle session pool will pool all sessions created by the driver.
+        /// When the <see cref="MaxIdleSessionPoolSize"/> is set to <see cref="InfiniteMaxIdleSessionPoolSize" /> the idle session pool will pool all sessions created by the driver.
         /// </summary>
-        public const int InfiniteIdleSessionPoolSize = -1;
+        public const int InfiniteMaxIdleSessionPoolSize = -1;
         static Config()
         {
             DefaultConfig = new Config
             {
-                TlsEnabled = false,
+                EncryptionLevel = EncryptionLevel.None,
                 Logger = new DebugLogger {Level = LogLevel.Info},
-                IdleSessionPoolSize = 20
+                MaxIdleSessionPoolSize = 10
             };
         }
 
@@ -44,9 +53,9 @@ static Config()
         /// <remarks>
         /// The defaults are <br/>
         /// <list type="bullet">
-        /// <item><see cref="TlsEnabled"/> : <c>false</c></item>
+        /// <item><see cref="EncryptionLevel"/> : <c><see cref="EncryptionLevel"/> None</c> </item>
         /// <item><see cref="Logger"/> : <c>DebugLogger</c> at <c><see cref="LogLevel"/> Info</c> </item>
-        /// <item><see cref="IdleSessionPoolSize"/> : <c>20</c> </item>
+        /// <item><see cref="MaxIdleSessionPoolSize"/> : <c>10</c> </item>
         /// </list>
         /// </remarks>
         public static Config DefaultConfig { get; }
@@ -57,21 +66,21 @@ static Config()
         public static IConfigBuilder Builder => new ConfigBuilder(new Config());
 
         /// <summary>
-        /// Gets or sets the use of TLS for all the connections created by the Driver.
+        /// Gets or sets the use of encryption for all the connections created by the Driver.
         /// </summary>
-        public bool TlsEnabled { get; set; }
+        public EncryptionLevel EncryptionLevel { get; set; }
 
         /// <summary>
         /// Gets or sets the <see cref="ILogger"/> instance to be used by the <see cref="ISession"/>s.
         /// </summary>
         public ILogger Logger { get; set; }
 
         /// <summary>
-        /// Gets or sets the idle session pool size.
+        /// Gets or sets the max idle session pool size.
         /// </summary>
-        /// <remarks> The idle session pool size represents the maximum number of sessions buffered for the driver. A buffered <see cref="ISession"/> 
+        /// <remarks> The max idle session pool size represents the maximum number of sessions buffered for the driver. A buffered <see cref="ISession"/>
         /// is a session that has already been connected to the database instance and doesn't need to re-initialize.</remarks>
-        public int IdleSessionPoolSize { get; set; }
+        public int MaxIdleSessionPoolSize { get; set; }
 
         private class ConfigBuilder : IConfigBuilder
         {
@@ -82,9 +91,9 @@ internal ConfigBuilder(Config config)
                 _config = config;
             }
 
-            public IConfigBuilder WithTlsEnabled(bool enableTls)
+            public IConfigBuilder WithEncryptionLevel(EncryptionLevel level)
             {
-                _config.TlsEnabled = enableTls;
+                _config.EncryptionLevel = level;
                 return this;
             }
 
@@ -94,9 +103,9 @@ public IConfigBuilder WithLogger(ILogger logger)
                 return this;
             }
 
-            public IConfigBuilder WithIdleSessionPoolSize(int size)
+            public IConfigBuilder WithMaxIdleSessionPoolSize(int size)
             {
-                _config.IdleSessionPoolSize = size;
+                _config.MaxIdleSessionPoolSize = size;
                 return this;
             }
 
@@ -121,12 +130,12 @@ public interface IConfigBuilder
         Config ToConfig();
 
         /// <summary>
-        /// Sets the <see cref="Config"/> to use TLS if <paramref name="enableTls"/> is <c>true</c>.
+        /// Sets the <see cref="Config"/> to use TLS if <paramref name="level"/> is <c>true</c>.
         /// </summary>
-        /// <param name="enableTls"><c>true</c> enables TLS for the connection, <c>false</c> otherwise.</param>
+        /// <param name="level"><c>Encrypted</c> enables TLS for the connection, <c>None</c> otherwise. See <see cref="EncryptionLevel"/> for more info</param>
         /// <returns>An <see cref="IConfigBuilder"/> instance for further configuration options.</returns>
         /// <remarks>Must call <see cref="ToConfig"/> to generate a <see cref="Config"/> instance.</remarks>
-        IConfigBuilder WithTlsEnabled(bool enableTls);
+        IConfigBuilder WithEncryptionLevel(EncryptionLevel level);
 
         /// <summary>
         /// Sets the <see cref="Config"/> to use a given <see cref="ILogger"/> instance.
@@ -139,10 +148,10 @@ public interface IConfigBuilder
         /// <summary>
         /// Sets the size of the idle session pool.
         /// </summary>
-        /// <param name="size">The size of the <see cref="Config.IdleSessionPoolSize"/>, set to <see cref="Config.InfiniteIdleSessionPoolSize"/> to pool all sessions.</param>
+        /// <param name="size">The size of the <see cref="Config.MaxIdleSessionPoolSize"/>, set to <see cref="Config.InfiniteMaxIdleSessionPoolSize"/> to pool all sessions.</param>
         /// <returns>An <see cref="IConfigBuilder"/> instance for further configuration options.</returns>
         /// <remarks>Must call <see cref="ToConfig"/> to generate a <see cref="Config"/> instance.</remarks>
-        IConfigBuilder WithIdleSessionPoolSize(int size);
+        IConfigBuilder WithMaxIdleSessionPoolSize(int size);
     }
 
 

Neo4j.Driver/Neo4j.Driver/Driver.cs

@@ -27,7 +27,7 @@ namespace Neo4j.Driver
     /// <remarks>
     ///     The Driver maintains a session pool buffering the <see cref="ISession" />s created by the user. The size of the
     ///     buffer can be
-    ///     configured by the <see cref="Config.IdleSessionPoolSize" /> property on the <see cref="Config" /> when creating the
+    ///     configured by the <see cref="Config.MaxIdleSessionPoolSize" /> property on the <see cref="Config" /> when creating the
     ///     Driver.
     /// </remarks>
     public class Driver : LoggerBase

Neo4j.Driver/Neo4j.Driver/Internal/Connector/SocketClient.cs

@@ -50,7 +50,7 @@ public void Dispose()
 
         public async Task Start()
         {
-            await _tcpSocketClient.ConnectAsync(_url.Host, _url.Port, _config.TlsEnabled).ConfigureAwait(false);
+            await _tcpSocketClient.ConnectAsync(_url.Host, _url.Port, _config.EncryptionLevel == EncryptionLevel.Encrypted).ConfigureAwait(false);
             IsOpen = true;
             _config.Logger?.Debug($"~~ [CONNECT] {_url}");
 

Neo4j.Driver/Neo4j.Driver/Internal/Entity.cs

@@ -176,7 +176,7 @@ public Path(IReadOnlyList<ISegment> segments, IReadOnlyList<INode> nodes,
 
         public bool Equals(IPath other)
         {
-            return Equals(Nodes, other.Nodes) && Equals(Relationships, other.Relationships);
+            return Equals(Start, other.Start) && Relationships.SequenceEqual(other.Relationships);
         }
 
         public override bool Equals(object obj)
@@ -191,8 +191,8 @@ public override int GetHashCode()
         {
             unchecked
             {
-                var hashCode = Nodes?.GetHashCode() ?? 0;
-                hashCode = (hashCode * 397) ^ (Relationships?.GetHashCode() ?? 0);
+                var hashCode = Start?.GetHashCode() ?? 0;
+                hashCode = Relationships?.Aggregate(hashCode, (current, relationship) => (current*397) ^ relationship.GetHashCode()) ?? hashCode;
                 return hashCode;
             }
         }

Neo4j.Driver/Neo4j.Driver/Internal/SessionPool.cs

@@ -37,7 +37,7 @@ public SessionPool(Uri uri, IAuthToken authToken, ILogger logger, Config config,
             _authToken = authToken;
             _config = config;
             _connection = connection;
-            _idleSessionPoolSize = config.IdleSessionPoolSize;
+            _idleSessionPoolSize = config.MaxIdleSessionPoolSize;
         }
 
         internal SessionPool(
@@ -111,7 +111,7 @@ public void Release(Guid sessionId)
                     lock (_availableSessions)
                     {
                         if (_availableSessions.Count < _idleSessionPoolSize ||
-                            _idleSessionPoolSize == Config.InfiniteIdleSessionPoolSize)
+                            _idleSessionPoolSize == Config.InfiniteMaxIdleSessionPoolSize)
                         {
                             _availableSessions.Enqueue(session);
                         }