Skip to content

Make CollectionUtilities.IsNullOrEmpty internal #2699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 11, 2024
Merged

Make CollectionUtilities.IsNullOrEmpty internal #2699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce0261e
Make IsNullOrEmpty internal
pmaytak Jul 11, 2024
423c40e
Make the extension method visible to SAML tests.
pmaytak Jul 11, 2024
8e57c40
Make class internal.
pmaytak Jul 11, 2024
d4ed6c3
Use string.IsNullOrEmpty where appropriate.
pmaytak Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.JsonWebTokens/JsonWebTokenHandler.CreateToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,14 +707,14 @@ internal static void WriteJwsPayload(

if (tokenDescriptor.Audiences.Count > 0)
{
if (!tokenDescriptor.Audience.IsNullOrEmpty())
if (!string.IsNullOrEmpty(tokenDescriptor.Audience))
JsonPrimitives.WriteStrings(ref writer, JwtPayloadUtf8Bytes.Aud, tokenDescriptor.Audiences, tokenDescriptor.Audience);
else
JsonPrimitives.WriteStrings(ref writer, JwtPayloadUtf8Bytes.Aud, tokenDescriptor.Audiences);

audienceSet = true;
}
else if (!tokenDescriptor.Audience.IsNullOrEmpty())
else if (!string.IsNullOrEmpty(tokenDescriptor.Audience))
{
writer.WritePropertyName(JwtPayloadUtf8Bytes.Aud);
writer.WriteStringValue(tokenDescriptor.Audience);
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.Tokens.Saml/Saml/SamlSecurityTokenHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,12 @@ protected virtual SamlConditions CreateConditions(SecurityTokenDescriptor tokenD

if (tokenDescriptor.Audiences.Count > 0)
{
if (!tokenDescriptor.Audience.IsNullOrEmpty())
if (!string.IsNullOrEmpty(tokenDescriptor.Audience))
conditions.Conditions.Add(CreateAudienceRestrictionCondition(tokenDescriptor.Audience, tokenDescriptor.Audiences));
else
conditions.Conditions.Add(CreateAudienceRestrictionCondition(tokenDescriptor.Audiences));
}
else if (!tokenDescriptor.Audience.IsNullOrEmpty())
else if (!string.IsNullOrEmpty(tokenDescriptor.Audience))
{
conditions.Conditions.Add(new SamlAudienceRestrictionCondition(new Uri(tokenDescriptor.Audience)));
}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.IdentityModel.Tokens/CollectionUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ namespace Microsoft.IdentityModel.Tokens
/// <summary>
/// A class which contains useful methods for processing collections.
/// </summary>
public static class CollectionUtilities
internal static class CollectionUtilities
{
/// <summary>
/// Checks whether the specified <paramref name="enumerable"/> is null or empty.
/// </summary>
/// <typeparam name="T">The type of the elements in the <paramref name="enumerable"/>.</typeparam>
/// <param name="enumerable">The <see cref="IEnumerable{T}"/> to be checked.</param>
/// <returns>True if the <paramref name="enumerable"/> is null or contains no elements; otherwise, false.</returns>
public static bool IsNullOrEmpty<T>(this IEnumerable<T> enumerable)
internal static bool IsNullOrEmpty<T>(this IEnumerable<T> enumerable)
{
return enumerable == null || !enumerable.Any();
}
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.IdentityModel.Tokens/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.S2S.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.S2S.Tokens.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.Tokens.Saml.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
4 changes: 2 additions & 2 deletions test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public void CheckExpectedDifferenceInAudClaimUsingSecurityTokenDescriptor(Create
foreach (var audience in theoryData.AudiencesForSecurityTokenDescriptor)
theoryData.TokenDescriptor.Audiences.Add(audience);
}
else if (!theoryData.TokenDescriptor.Audience.IsNullOrEmpty())
else if (!string.IsNullOrEmpty(theoryData.TokenDescriptor.Audience))
{
audMemberSet = true;
}
Expand Down Expand Up @@ -306,7 +306,7 @@ public void CheckExpectedDifferenceInAudClaimUsingSecurityTokenDescriptor(Create
if (theoryData.TokenDescriptor.Audiences.Count > 0)
expectedAudClaimCount += theoryData.TokenDescriptor.Audiences.Count;

if (!theoryData.TokenDescriptor.Audience.IsNullOrEmpty())
if (!string.IsNullOrEmpty(theoryData.TokenDescriptor.Audience))
expectedAudClaimCount++;

if (audSetInClaims)
Expand Down