Handle nullability of adjacent TargetInfo

RenderMichael · RenderMichael · commit c54215d07f43 · 2025-02-05T16:47:02.000-05:00
diff --git a/dotnet/src/webdriver/DevTools/TargetInfo.cs b/dotnet/src/webdriver/DevTools/TargetInfo.cs
@@ -17,46 +17,69 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
     /// Represents information about the target of a DevTools Protocol command
     /// </summary>
     public class TargetInfo
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TargetInfo"/> type.
+        /// </summary>
+        /// <param name="targetId">The ID of the target.</param>
+        /// <param name="type">The type of target.</param>
+        /// <param name="title">The title of the target.</param>
+        /// <param name="url">The URL of the target.</param>
+        /// <param name="isAttached">Whether the protocol is attached to the target.</param>
+        /// <param name="openerId">The ID of the opener of the target.</param>
+        /// <param name="browserContextId">The browser context ID.</param>
+        public TargetInfo(string targetId, string type, string title, string url, bool isAttached, string? openerId, string? browserContextId)
+        {
+            this.TargetId = targetId;
+            this.Type = type;
+            this.Title = title;
+            this.Url = url;
+            this.IsAttached = isAttached;
+            this.OpenerId = openerId;
+            this.BrowserContextId = browserContextId;
+        }
+
         /// <summary>
         /// Gets the ID of the target.
         /// </summary>
-        public string TargetId { get; internal set; }
+        public string TargetId { get; }
 
         /// <summary>
         /// Gets the type of target.
         /// </summary>
-        public string Type { get; internal set; }
+        public string Type { get; }
 
         /// <summary>
         /// Gets the title of the target.
         /// </summary>
-        public string Title { get; internal set; }
+        public string Title { get; }
 
         /// <summary>
         /// Gets the URL of the target.
         /// </summary>
-        public string Url { get; internal set; }
+        public string Url { get; }
 
         /// <summary>
         /// Gets a value indicating if the protocol is attached to the target.
         /// </summary>
-        public bool IsAttached { get; internal set; }
+        public bool IsAttached { get; }
 
         /// <summary>
         /// Gets the ID of the opener of the target.
         /// </summary>
-        public string OpenerId { get; internal set; }
+        public string? OpenerId { get; }
 
         /// <summary>
         /// Gets the browser context ID.
         /// </summary>
-        public string BrowserContextId { get; internal set; }
+        public string? BrowserContextId { get; }
     }
 }
diff --git a/dotnet/src/webdriver/DevTools/v130/V130Target.cs b/dotnet/src/webdriver/DevTools/v130/V130Target.cs
@@ -64,16 +64,16 @@ public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? se
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];
-                var mapped = new TargetInfo()
-                {
-                    TargetId = targetInfo.TargetId,
-                    Title = targetInfo.Title,
-                    Type = targetInfo.Type,
-                    Url = targetInfo.Url,
-                    OpenerId = targetInfo.OpenerId,
-                    BrowserContextId = targetInfo.BrowserContextId,
-                    IsAttached = targetInfo.Attached
-                };
+                var mapped = new TargetInfo
+                (
+                    targetId: targetInfo.TargetId,
+                    title: targetInfo.Title,
+                    type: targetInfo.Type,
+                    url: targetInfo.Url,
+                    openerId: targetInfo.OpenerId,
+                    browserContextId: targetInfo.BrowserContextId,
+                    isAttached: targetInfo.Attached
+                );
                 targets.Add(mapped);
             }
 
@@ -126,15 +126,15 @@ private void OnDetachedFromTarget(object? sender, DetachedFromTargetEventArgs e)
         private void OnAttachedToTarget(object? sender, AttachedToTargetEventArgs e)
         {
             var targetInfo = e.TargetInfo == null ? null : new TargetInfo
-            {
-                BrowserContextId = e.TargetInfo.BrowserContextId,
-                IsAttached = e.TargetInfo.Attached,
-                OpenerId = e.TargetInfo.OpenerId,
-                TargetId = e.TargetInfo.TargetId,
-                Title = e.TargetInfo.Title,
-                Type = e.TargetInfo.Type,
-                Url = e.TargetInfo.Url
-            };
+            (
+                browserContextId: e.TargetInfo.BrowserContextId,
+                isAttached: e.TargetInfo.Attached,
+                openerId: e.TargetInfo.OpenerId,
+                targetId: e.TargetInfo.TargetId,
+                title: e.TargetInfo.Title,
+                type: e.TargetInfo.Type,
+                url: e.TargetInfo.Url
+            );
 
             this.OnTargetAttached(new TargetAttachedEventArgs
             (
diff --git a/dotnet/src/webdriver/DevTools/v131/V131Target.cs b/dotnet/src/webdriver/DevTools/v131/V131Target.cs
@@ -64,16 +64,16 @@ public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? se
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];
-                var mapped = new TargetInfo()
-                {
-                    TargetId = targetInfo.TargetId,
-                    Title = targetInfo.Title,
-                    Type = targetInfo.Type,
-                    Url = targetInfo.Url,
-                    OpenerId = targetInfo.OpenerId,
-                    BrowserContextId = targetInfo.BrowserContextId,
-                    IsAttached = targetInfo.Attached
-                };
+                var mapped = new TargetInfo
+                (
+                    targetId: targetInfo.TargetId,
+                    title: targetInfo.Title,
+                    type: targetInfo.Type,
+                    url: targetInfo.Url,
+                    openerId: targetInfo.OpenerId,
+                    browserContextId: targetInfo.BrowserContextId,
+                    isAttached: targetInfo.Attached
+                );
                 targets.Add(mapped);
             }
 
@@ -126,15 +126,15 @@ private void OnDetachedFromTarget(object? sender, DetachedFromTargetEventArgs e)
         private void OnAttachedToTarget(object? sender, AttachedToTargetEventArgs e)
         {
             var targetInfo = e.TargetInfo == null ? null : new TargetInfo
-            {
-                BrowserContextId = e.TargetInfo.BrowserContextId,
-                IsAttached = e.TargetInfo.Attached,
-                OpenerId = e.TargetInfo.OpenerId,
-                TargetId = e.TargetInfo.TargetId,
-                Title = e.TargetInfo.Title,
-                Type = e.TargetInfo.Type,
-                Url = e.TargetInfo.Url
-            };
+            (
+                browserContextId: e.TargetInfo.BrowserContextId,
+                isAttached: e.TargetInfo.Attached,
+                openerId: e.TargetInfo.OpenerId,
+                targetId: e.TargetInfo.TargetId,
+                title: e.TargetInfo.Title,
+                type: e.TargetInfo.Type,
+                url: e.TargetInfo.Url
+            );
 
             this.OnTargetAttached(new TargetAttachedEventArgs
             (
diff --git a/dotnet/src/webdriver/DevTools/v132/V132Target.cs b/dotnet/src/webdriver/DevTools/v132/V132Target.cs
@@ -64,16 +64,16 @@ public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? se
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];
-                var mapped = new TargetInfo()
-                {
-                    TargetId = targetInfo.TargetId,
-                    Title = targetInfo.Title,
-                    Type = targetInfo.Type,
-                    Url = targetInfo.Url,
-                    OpenerId = targetInfo.OpenerId,
-                    BrowserContextId = targetInfo.BrowserContextId,
-                    IsAttached = targetInfo.Attached
-                };
+                var mapped = new TargetInfo
+                (
+                    targetId: targetInfo.TargetId,
+                    title: targetInfo.Title,
+                    type: targetInfo.Type,
+                    url: targetInfo.Url,
+                    openerId: targetInfo.OpenerId,
+                    browserContextId: targetInfo.BrowserContextId,
+                    isAttached: targetInfo.Attached
+                );
                 targets.Add(mapped);
             }
 
@@ -126,15 +126,15 @@ private void OnDetachedFromTarget(object? sender, DetachedFromTargetEventArgs e)
         private void OnAttachedToTarget(object? sender, AttachedToTargetEventArgs e)
         {
             var targetInfo = e.TargetInfo == null ? null : new TargetInfo
-            {
-                BrowserContextId = e.TargetInfo.BrowserContextId,
-                IsAttached = e.TargetInfo.Attached,
-                OpenerId = e.TargetInfo.OpenerId,
-                TargetId = e.TargetInfo.TargetId,
-                Title = e.TargetInfo.Title,
-                Type = e.TargetInfo.Type,
-                Url = e.TargetInfo.Url
-            };
+            (
+                browserContextId: e.TargetInfo.BrowserContextId,
+                isAttached: e.TargetInfo.Attached,
+                openerId: e.TargetInfo.OpenerId,
+                targetId: e.TargetInfo.TargetId,
+                title: e.TargetInfo.Title,
+                type: e.TargetInfo.Type,
+                url: e.TargetInfo.Url
+            );
 
             this.OnTargetAttached(new TargetAttachedEventArgs
             (
diff --git a/dotnet/src/webdriver/DevTools/v85/V85Target.cs b/dotnet/src/webdriver/DevTools/v85/V85Target.cs
@@ -62,16 +62,16 @@ public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? se
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];
-                var mapped = new TargetInfo()
-                {
-                    TargetId = targetInfo.TargetId,
-                    Title = targetInfo.Title,
-                    Type = targetInfo.Type,
-                    Url = targetInfo.Url,
-                    OpenerId = targetInfo.OpenerId,
-                    BrowserContextId = targetInfo.BrowserContextId,
-                    IsAttached = targetInfo.Attached
-                };
+                var mapped = new TargetInfo
+                (
+                    targetId: targetInfo.TargetId,
+                    title: targetInfo.Title,
+                    type: targetInfo.Type,
+                    url: targetInfo.Url,
+                    openerId: targetInfo.OpenerId,
+                    browserContextId: targetInfo.BrowserContextId,
+                    isAttached: targetInfo.Attached
+                );
                 targets.Add(mapped);
             }
 
@@ -124,15 +124,15 @@ private void OnDetachedFromTarget(object? sender, DetachedFromTargetEventArgs e)
         private void OnAttachedToTarget(object? sender, AttachedToTargetEventArgs e)
         {
             var targetInfo = e.TargetInfo == null ? null : new TargetInfo
-            {
-                BrowserContextId = e.TargetInfo.BrowserContextId,
-                IsAttached = e.TargetInfo.Attached,
-                OpenerId = e.TargetInfo.OpenerId,
-                TargetId = e.TargetInfo.TargetId,
-                Title = e.TargetInfo.Title,
-                Type = e.TargetInfo.Type,
-                Url = e.TargetInfo.Url
-            };
+            (
+                browserContextId: e.TargetInfo.BrowserContextId,
+                isAttached: e.TargetInfo.Attached,
+                openerId: e.TargetInfo.OpenerId,
+                targetId: e.TargetInfo.TargetId,
+                title: e.TargetInfo.Title,
+                type: e.TargetInfo.Type,
+                url: e.TargetInfo.Url
+            );
 
             this.OnTargetAttached(new TargetAttachedEventArgs
             (
