Skip to content
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.

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

Spanify and cleanup System.Security.Principal.Windows #1637

Merged
merged 7 commits into from
Jan 17, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class IdentityReferenceCollection : ICollection<IdentityReference>
// Container enumerated by this collection
//

private readonly List<IdentityReference> _Identities;
private readonly List<IdentityReference> _identities;

#endregion

Expand All @@ -39,7 +39,7 @@ public IdentityReferenceCollection()

public IdentityReferenceCollection(int capacity)
{
_Identities = new List<IdentityReference>(capacity);
_identities = new List<IdentityReference>(capacity);
}

#endregion
Expand All @@ -48,14 +48,14 @@ public IdentityReferenceCollection(int capacity)

public void CopyTo(IdentityReference[] array, int offset)
{
_Identities.CopyTo(0, array, offset, Count);
_identities.CopyTo(0, array, offset, Count);
}

public int Count
{
get
{
return _Identities.Count;
return _identities.Count;
}
}

Expand All @@ -74,7 +74,7 @@ public void Add(IdentityReference identity)
throw new ArgumentNullException(nameof(identity));
}

_Identities.Add(identity);
_identities.Add(identity);
}

public bool Remove(IdentityReference identity)
Expand All @@ -86,15 +86,15 @@ public bool Remove(IdentityReference identity)

if (Contains(identity))
{
return _Identities.Remove(identity);
return _identities.Remove(identity);
}

return false;
}

public void Clear()
{
_Identities.Clear();
_identities.Clear();
}

public bool Contains(IdentityReference identity)
Expand All @@ -104,7 +104,7 @@ public bool Contains(IdentityReference identity)
throw new ArgumentNullException(nameof(identity));
}

return _Identities.Contains(identity);
return _identities.Contains(identity);
}

#endregion
Expand All @@ -129,25 +129,24 @@ public IdentityReference this[int index]
{
get
{
return _Identities[index];
return _identities[index];
}

set
{
if (value == null)
if (value is null)
{
throw new ArgumentNullException(nameof(value));
}

_Identities[index] = value;
_identities[index] = value;
}
}

internal List<IdentityReference> Identities
{
get
{
return _Identities;
return _identities;
}
}

Expand Down Expand Up @@ -398,11 +397,10 @@ internal class IdentityReferenceEnumerator : IEnumerator<IdentityReference>, IDi

internal IdentityReferenceEnumerator(IdentityReferenceCollection collection)
{
if (collection == null)
if (collection is null)
{
throw new ArgumentNullException(nameof(collection));
}

_collection = collection;
_current = -1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ internal IdentityReference()

public abstract IdentityReference Translate(Type targetType);

public override abstract bool Equals(object o);
public abstract override bool Equals(object o);

public override abstract int GetHashCode();
public abstract override int GetHashCode();

public override abstract string ToString();
public abstract override string ToString();

public static bool operator ==(IdentityReference left, IdentityReference right)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,13 @@ public override string ToString()

internal static IdentityReferenceCollection Translate(IdentityReferenceCollection sourceAccounts, Type targetType, bool forceSuccess)
{
bool SomeFailed = false;
IdentityReferenceCollection Result;
IdentityReferenceCollection result = Translate(sourceAccounts, targetType, out bool someFailed);

Result = Translate(sourceAccounts, targetType, out SomeFailed);

if (forceSuccess && SomeFailed)
if (forceSuccess && someFailed)
{
IdentityReferenceCollection UnmappedIdentities = new IdentityReferenceCollection();

foreach (IdentityReference id in Result)
foreach (IdentityReference id in result)
{
if (id.GetType() != targetType)
{
Expand All @@ -174,7 +171,7 @@ internal static IdentityReferenceCollection Translate(IdentityReferenceCollectio
throw new IdentityNotMappedException(SR.IdentityReference_IdentityNotMapped, UnmappedIdentities);
}

return Result;
return result;
}

internal static IdentityReferenceCollection Translate(IdentityReferenceCollection sourceAccounts, Type targetType, out bool someFailed)
Expand Down Expand Up @@ -348,7 +345,7 @@ private static IdentityReferenceCollection TranslateToSids(IdentityReferenceColl
case SidNameUse.Alias:
case SidNameUse.Computer:
case SidNameUse.WellKnownGroup:
Result.Add(new SecurityIdentifier(Lts.Sid, true));
Result.Add(new SecurityIdentifier(Lts.Sid));
break;

default:
Expand Down
Loading