Make resource throw if not found instead of null

Author: donnie-msft

src/NuGet.Core/NuGet.Protocol/Providers/OwnerDetailsUriResourceV3Provider.cs

@@ -29,8 +29,12 @@ public OwnerDetailsUriResourceV3Provider()
             ServiceIndexResourceV3? serviceIndex = await source.GetResourceAsync<ServiceIndexResourceV3>(token);
             if (serviceIndex != null)
             {
-                Uri uriTemplate = serviceIndex.GetServiceEntryUri(ServiceTypes.OwnerDetailsUriTemplate);
-                resource = OwnerDetailsUriTemplateResourceV3.CreateOrNull(uriTemplate);
+                Uri? uriTemplate = serviceIndex.GetServiceEntryUri(ServiceTypes.OwnerDetailsUriTemplate);
+
+                if (uriTemplate != null)
+                {
+                    resource = OwnerDetailsUriTemplateResourceV3.CreateOrNull(uriTemplate);
+                }
             }
 
             return new Tuple<bool, INuGetResource?>(resource != null, resource);

src/NuGet.Core/NuGet.Protocol/PublicAPI/net472/PublicAPI.Unshipped.txt

@@ -4,7 +4,7 @@ NuGet.Protocol.Providers.OwnerDetailsUriResourceV3Provider.OwnerDetailsUriResour
 NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3
 NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.GetUri(string! owner) -> System.Uri!
 override NuGet.Protocol.Providers.OwnerDetailsUriResourceV3Provider.TryCreate(NuGet.Protocol.Core.Types.SourceRepository! source, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task<System.Tuple<bool, NuGet.Protocol.Core.Types.INuGetResource?>!>!
-static NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.CreateOrNull(System.Uri? uriTemplate) -> NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3?
+static NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.CreateOrNull(System.Uri! uriTemplate) -> NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3?
 ~NuGet.Protocol.Core.Types.IPackageSearchMetadata.OwnersList.get -> System.Collections.Generic.IReadOnlyList<string>
 ~NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.OwnersList.get -> System.Collections.Generic.IReadOnlyList<string>
 ~NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.OwnersList.set -> void

src/NuGet.Core/NuGet.Protocol/PublicAPI/netcoreapp5.0/PublicAPI.Unshipped.txt

@@ -4,7 +4,7 @@ NuGet.Protocol.Providers.OwnerDetailsUriResourceV3Provider.OwnerDetailsUriResour
 NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3
 NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.GetUri(string! owner) -> System.Uri!
 override NuGet.Protocol.Providers.OwnerDetailsUriResourceV3Provider.TryCreate(NuGet.Protocol.Core.Types.SourceRepository! source, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task<System.Tuple<bool, NuGet.Protocol.Core.Types.INuGetResource?>!>!
-static NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.CreateOrNull(System.Uri? uriTemplate) -> NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3?
+static NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.CreateOrNull(System.Uri! uriTemplate) -> NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3?
 ~NuGet.Protocol.Core.Types.IPackageSearchMetadata.OwnersList.get -> System.Collections.Generic.IReadOnlyList<string>
 ~NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.OwnersList.get -> System.Collections.Generic.IReadOnlyList<string>
 ~NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.OwnersList.set -> void

src/NuGet.Core/NuGet.Protocol/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

@@ -4,7 +4,7 @@ NuGet.Protocol.Providers.OwnerDetailsUriResourceV3Provider.OwnerDetailsUriResour
 NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3
 NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.GetUri(string! owner) -> System.Uri!
 override NuGet.Protocol.Providers.OwnerDetailsUriResourceV3Provider.TryCreate(NuGet.Protocol.Core.Types.SourceRepository! source, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task<System.Tuple<bool, NuGet.Protocol.Core.Types.INuGetResource?>!>!
-static NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.CreateOrNull(System.Uri? uriTemplate) -> NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3?
+static NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3.CreateOrNull(System.Uri! uriTemplate) -> NuGet.Protocol.Resources.OwnerDetailsUriTemplateResourceV3?
 ~NuGet.Protocol.Core.Types.IPackageSearchMetadata.OwnersList.get -> System.Collections.Generic.IReadOnlyList<string>
 ~NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.OwnersList.get -> System.Collections.Generic.IReadOnlyList<string>
 ~NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.OwnersList.set -> void

src/NuGet.Core/NuGet.Protocol/Resources/OwnerDetailsUriTemplateResourceV3.cs

@@ -25,35 +25,21 @@ private OwnerDetailsUriTemplateResourceV3(string template)
         /// </summary>
         /// <param name="uriTemplate">The Absolute Uri template provided by the server.</param>
         /// <returns>A valid Owner Details Uri template, or null.</returns>
-        public static OwnerDetailsUriTemplateResourceV3? CreateOrNull(Uri? uriTemplate)
+        public static OwnerDetailsUriTemplateResourceV3? CreateOrNull(Uri uriTemplate)
         {
-            if (uriTemplate == null || uriTemplate.OriginalString.Length == 0 || !uriTemplate.IsAbsoluteUri)
+            if (uriTemplate is null)
             {
-                return null;
+                throw new ArgumentNullException(nameof(uriTemplate));
             }
 
-            string absoluteUri = uriTemplate.OriginalString;
-            if (string.IsNullOrWhiteSpace(absoluteUri)
-                || !IsValidUriTemplate(absoluteUri))
+            if (uriTemplate.OriginalString.Length == 0
+                || !uriTemplate.IsAbsoluteUri
+                || !uriTemplate.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
             {
                 return null;
             }
 
-            return new OwnerDetailsUriTemplateResourceV3(absoluteUri);
-        }
-
-        private static bool IsValidUriTemplate(string absoluteUri)
-        {
-            Uri? uri;
-            var isValidUri = Uri.TryCreate(absoluteUri, UriKind.Absolute, out uri);
-
-            // Only allow HTTPS owner details URLs.
-            if (isValidUri && uri?.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) != true)
-            {
-                return false;
-            }
-
-            return isValidUri;
+            return new OwnerDetailsUriTemplateResourceV3(uriTemplate.OriginalString);
         }
 
         /// <summary>

test/NuGet.Core.Tests/NuGet.Protocol.Tests/Resources/OwnerDetailsUriTemplateResourceV3Tests.cs

@@ -15,16 +15,13 @@ public class OwnerDetailsUriTemplateResourceV3Tests
         private readonly Uri _template = new Uri("https://nuget.test/profiles/{owner}?_src=template");
 
         [Fact]
-        public void CreateOrNull_WhenNullTemplate_CreatesNullResource()
+        public void CreateOrNull_WhenNullTemplate_Throws()
         {
             // Arrange
             Uri? template = null;
 
-            // Act
-            var target = OwnerDetailsUriTemplateResourceV3.CreateOrNull(template);
-
-            // Assert
-            target.Should().BeNull();
+            // Act & Assert
+            Assert.Throws<ArgumentNullException>(() => OwnerDetailsUriTemplateResourceV3.CreateOrNull(template!));
         }
 
         [Fact]