Notifications config

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Reactive/SummaryIT.cs

@@ -268,7 +268,8 @@ public void ShouldReturnNotifications()
                                 null,
                                 null,
                                 null,
-                                "WARNING")
+                                "WARNING",
+                                null)
                         }
                     },
                     options => options.ExcludingMissingMembers()

Neo4j.Driver/Neo4j.Driver.Tests.TestBackend/Protocol/Driver/NewDriver.cs

@@ -141,8 +141,27 @@ List<string> GetPaths()
             configBuilder.WithFetchSize(data.fetchSize.Value);
         }
 
-        var logger = new SimpleLogger();
+        if (data.notificationsMinSeverity != null || data.notificationsDisabledCategories != null)
+        {
+            if (data.notificationsMinSeverity == "OFF")
+            {
+                configBuilder.WithNotificationsDisabled();
+            }
+            else
+            {
+                var sev = Enum.TryParse<Severity>(data.notificationsMinSeverity ?? "ignore", true, out var severity)
+                    ? (Severity?)severity
+                    : null;
+
+                var cats = data.notificationsDisabledCategories
+                    ?.Select(x => Enum.Parse<Category>(x, true))
+                    .ToArray();
+
+                configBuilder.WithNotifications(sev, cats);
+            }
+        }
 
+        var logger = new SimpleLogger();
         configBuilder.WithLogger(logger);
     }
 
@@ -177,5 +196,8 @@ public string[] trustedCertificates
         }
 
         public bool? encrypted { get; set; }
+
+        public string notificationsMinSeverity { get; set; }
+        public string[] notificationsDisabledCategories { get; set; }
     }
 }

Neo4j.Driver/Neo4j.Driver.Tests.TestBackend/Protocol/Driver/NewDriverConverter.cs

@@ -48,6 +48,7 @@ public override NewDriver.NewDriverType ReadJson(
         newDriverRequest.connectionAcquisitionTimeoutMs = jsonObj["connectionAcquisitionTimeoutMs"]?.Value<int?>();
         newDriverRequest.fetchSize = jsonObj["fetchSize"]?.Value<long?>();
         newDriverRequest.maxTxRetryTimeMs = jsonObj["maxTxRetryTimeMs"]?.Value<long?>();
+        newDriverRequest.notificationsMinSeverity = jsonObj["notificationsMinSeverity"]?.Value<string>();
 
         if (jsonObj.TryGetValue("trustedCertificates", out var token))
         {
@@ -59,6 +60,9 @@ public override NewDriver.NewDriverType ReadJson(
             newDriverRequest.encrypted = token.Value<bool?>();
         }
 
+        if (jsonObj.TryGetValue("notificationsDisabledCategories", out token))
+            newDriverRequest.notificationsDisabledCategories = token.ToObject<string[]>();
+
         return newDriverRequest;
     }
 }

Neo4j.Driver/Neo4j.Driver.Tests.TestBackend/Protocol/Result/SummaryJsonSerializer.cs

@@ -173,7 +173,11 @@ private static object CreateNotificationList(IResultSummary summary)
             return summary.Notifications.Select(
                     x => new
                     {
+                        rawCategory = x.RawCategory ?? String.Empty,
+                        category = x.Category.ToString().ToUpper(),
                         severity = x.Severity,
+                        rawSeverityLevel = x.RawSeverityLevel ?? String.Empty,
+                        severityLevel = x.SeverityLevel.ToString().ToUpper(),
                         description = x.Description,
                         code = x.Code,
                         title = x.Title
@@ -184,7 +188,11 @@ private static object CreateNotificationList(IResultSummary summary)
         return summary.Notifications.Select(
                 x => new
                 {
+                    rawCategory = x.RawCategory ?? String.Empty,
+                    category = x.Category.ToString().ToUpper(),
                     severity = x.Severity,
+                    rawSeverityLevel = x.RawSeverityLevel ?? String.Empty,
+                    severityLevel = x.SeverityLevel.ToString().ToUpper(),
                     description = x.Description,
                     code = x.Code,
                     title = x.Title,

Neo4j.Driver/Neo4j.Driver.Tests.TestBackend/Protocol/Session/NewSession.cs

@@ -15,7 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
@@ -85,6 +87,26 @@ private void SessionConfig(SessionConfigBuilder configBuilder)
                 ObjManager.GetObject<NewBookmarkManager>(data.bookmarkManagerId)
                     .BookmarkManager);
         }
+
+        if (data.notificationsMinSeverity != null || data.notificationsDisabledCategories != null)
+        {
+            if (data.notificationsMinSeverity == "OFF")
+            {
+                configBuilder.WithNotificationsDisabled();
+            }
+            else
+            {
+                var sev = Enum.TryParse<Severity>(data.notificationsMinSeverity ?? "ignore", true, out var severity)
+                    ? (Severity?)severity
+                    : null;
+
+                var cats = data.notificationsDisabledCategories
+                    ?.Select(x => Enum.Parse<Category>(x, true))
+                    .ToArray();
+
+                configBuilder.WithNotifications(sev, cats);
+            }
+        }
     }
 
     public override async Task Process()
@@ -127,5 +149,10 @@ public class NewSessionType
         public string impersonatedUser { get; set; }
 
         public string bookmarkManagerId { get; set; }
+
+        public AuthorizationToken authorizationToken { get; set; }
+
+        public string notificationsMinSeverity { get; set; }
+        public string[] notificationsDisabledCategories { get; set; }
     }
 }

Neo4j.Driver/Neo4j.Driver.Tests.TestBackend/SupportedFeatures.cs

@@ -34,11 +34,13 @@ static SupportedFeatures()
             "Feature:API:Driver.ExecuteQuery",
             "Feature:API:Driver:GetServerInfo",
             "Feature:API:Driver.IsEncrypted",
+            "Feature:API:Driver:NotificationsConfig",
             "Feature:API:Driver.VerifyConnectivity",
             //"Feature:API:Liveness.Check",
             "Feature:API:Result.List",
             "Feature:API:Result.Peek",
             "Feature:API:Result.Single",
+            "Feature:API:Session:NotificationsConfig",
             "Feature:API:SSLConfig",
             "Feature:API:SSLSchemes",
             "Feature:API:Type.Temporal",
@@ -51,6 +53,7 @@ static SupportedFeatures()
             "Feature:Bolt:4.3",
             "Feature:Bolt:4.4",
             "Feature:Bolt:5.0",
+            "Feature:Bolt:5.2",
             "Feature:Bolt:Patch:UTC",
             "Feature:Impersonation",
             //"Feature:TLS:1.1",

Neo4j.Driver/Neo4j.Driver.Tests/AsyncSessionTests.cs

@@ -98,7 +98,8 @@ public async Task ShouldDelegateToProtocolRunAutoCommitTxAsync(bool reactive)
                 await session.RunAsync("lalalal");
 
                 mockConn.Verify(
-                    x => x.RunInAutoCommitTransactionAsync(It.IsAny<AutoCommitParams>()),
+                    x => x.RunInAutoCommitTransactionAsync(It.IsAny<AutoCommitParams>(), 
+                        It.IsAny<INotificationsConfig>()),
                     Times.Once);
             }
         }
@@ -207,7 +208,8 @@ public async void ShouldCloseConnectionOnRunIfBeginTxFailed()
                                 It.IsAny<string>(),
                                 It.IsAny<Bookmarks>(),
                                 It.IsAny<TransactionConfig>(),
-                                It.IsAny<string>()))
+                                It.IsAny<string>(),
+                                It.IsAny<INotificationsConfig>()))
                     .Throws(new IOException("Triggered an error when beginTx"));
 
                 var session = NewSession(mockConn.Object);
@@ -235,7 +237,8 @@ public async void ShouldCloseConnectionOnNewBeginTxIfBeginTxFailed()
                                 It.IsAny<string>(),
                                 It.IsAny<Bookmarks>(),
                                 It.IsAny<TransactionConfig>(),
-                                It.IsAny<string>()))
+                                It.IsAny<string>(),
+                                It.IsAny<INotificationsConfig>()))
                     .Returns(Task.CompletedTask)
                     .Callback(
                         () =>
@@ -274,7 +277,8 @@ public async void ShouldCloseConnectionIfBeginTxFailed()
                                 It.IsAny<string>(),
                                 It.IsAny<Bookmarks>(),
                                 It.IsAny<TransactionConfig>(),
-                                It.IsAny<string>()))
+                                It.IsAny<string>(),
+                                It.IsAny<INotificationsConfig>()))
                     .Throws(new IOException("Triggered an error when beginTx"));
 
                 var session = NewSession(mockConn.Object);

Neo4j.Driver/Neo4j.Driver.Tests/ConnectionPoolTests.cs

@@ -101,7 +101,9 @@ public async Task ShouldCallConnInit()
                 await connectionPool.AcquireAsync(AccessMode.Read, null, null, Bookmarks.Empty);
 
                 //Then
-                mock.Verify(x => x.InitAsync(It.IsAny<CancellationToken>()), Times.Once);
+                mock.Verify(
+                    x => x.InitAsync(It.IsAny<INotificationsConfig>(), It.IsAny<CancellationToken>()),
+                    Times.Once);
             }
 
             [Fact]
@@ -217,7 +219,10 @@ public async Task ShouldCreateNewWhenQueueIsEmpty()
             public async Task ShouldCloseConnectionIfFailedToCreate()
             {
                 var connMock = new Mock<IPooledConnection>();
-                connMock.Setup(x => x.InitAsync(It.IsAny<CancellationToken>())).Throws<NotImplementedException>();
+                connMock.Setup(x => x.InitAsync(
+                        It.IsAny<INotificationsConfig>(),
+                        It.IsAny<CancellationToken>()))
+                    .Throws<NotImplementedException>();
 
                 var connFactory = new MockedConnectionFactory(connMock.Object);
                 var pool = new ConnectionPool(connFactory);

Neo4j.Driver/Neo4j.Driver.Tests/Connector/SocketConnectionTests.cs

@@ -76,11 +76,17 @@ public async Task ShouldConnectClient()
                 var conn = NewSocketConnection(mockClient.Object, boltProtocolFactory: bpFactory.Object);
 
                 // When
-                await conn.InitAsync();
+                await conn.InitAsync(null);
 
                 // Then
                 mockClient.Verify(c => c.ConnectAsync(null, CancellationToken.None), Times.Once);
-                protocolMock.Verify(x => x.LoginAsync(conn, It.IsAny<string>(), It.IsAny<IAuthToken>()), Times.Once);
+                protocolMock.Verify(
+                    x => x.AuthenticateAsync(
+                        conn,
+                        It.IsAny<string>(),
+                        It.IsAny<IAuthToken>(),
+                        It.IsAny<INotificationsConfig>()),
+                    Times.Once);
             }
 
             [Fact]
@@ -94,7 +100,7 @@ public async Task ShouldThrowClientErrorIfFailedToConnectToServerWithinTimeout()
                 // ReSharper disable once ObjectCreationAsStatement
                 var conn = new SocketConnection(mockClient.Object, AuthToken, UserAgent, Logger, Server);
                 // When
-                var error = await Record.ExceptionAsync(() => conn.InitAsync());
+                var error = await Record.ExceptionAsync(() => conn.InitAsync(null));
                 // Then
                 error.Should().BeOfType<IOException>();
                 error.Message.Should().Be("I will stop socket conn from initialization");

Neo4j.Driver/Neo4j.Driver.Tests/Internal/IO/MessageSerializers/BeginMessageSerializerTests.cs

@@ -48,6 +48,7 @@ public void ShouldThrowWhenNotCommitMessage()
         [InlineData(4, 3)]
         [InlineData(4, 4)]
         [InlineData(5, 0)]
+        [InlineData(5, 2)]
         [InlineData(6, 0)]
         public void ShouldSerialize(int major, int minor)
         {
@@ -62,8 +63,8 @@ public void ShouldSerialize(int major, int minor)
                 "neo4j",
                 new InternalBookmarks("a"),
                 null,
-                null,
                 AccessMode.Read,
+                null,
                 null);
 
             BeginMessageSerializer.Instance.Serialize(psw, message);

Neo4j.Driver/Neo4j.Driver.Tests/Internal/IO/MessageSerializers/HelloMessageSerializerTests.cs

@@ -16,6 +16,7 @@
 // limitations under the License.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using FluentAssertions;
 using Neo4j.Driver.Internal.Connector;
@@ -48,7 +49,6 @@ public void ShouldThrowIfPassedWrongMessage()
         [InlineData(4, 3)]
         [InlineData(4, 4)]
         [InlineData(5, 0)]
-        [InlineData(6, 0)]
         public void ShouldSerialize(int major, int minor)
         {
             using var memory = new MemoryStream();
@@ -58,7 +58,10 @@ public void ShouldSerialize(int major, int minor)
 
             var psw = new PackStreamWriter(format, memory);
 
-            HelloMessageSerializer.Instance.Serialize(psw, new HelloMessage(boltProtocolVersion, "user", null, null));
+            HelloMessageSerializer.Instance.Serialize(
+                psw,
+                new HelloMessage(boltProtocolVersion, "user", null, null as IDictionary<string, string>));
+
             memory.Position = 0;
 
             var reader = new PackStreamReader(format, memory, new ByteBuffers());

Neo4j.Driver/Neo4j.Driver.Tests/Internal/IO/MessageSerializers/RollbackMessageSerializerTests.cs

@@ -37,7 +37,7 @@ public void ShouldBeAbleToWriteRunWithMetadataMessage()
         [Fact]
         public void ShouldThrowIfPassedWrongMessage()
         {
-            var message = new BeginMessage(BoltProtocolVersion.V3_0, "we", null, null, AccessMode.Read, null);
+            var message = new BeginMessage(BoltProtocolVersion.V3_0, "we", null, null, AccessMode.Read, null, null);
             Record.Exception(() => RollbackMessageSerializer.Instance.Serialize(null, message))
                 .Should()
                 .BeOfType<ArgumentOutOfRangeException>();