Skip to content

Commit

Permalink
Changed GetFieldIndex(string[] names...) to GetFieldIndex(IEnumerable…
Browse files Browse the repository at this point in the history
…<string> names...).

Breaking change.
  • Loading branch information
JoshClose committed Oct 5, 2022
1 parent 62dd759 commit 5ef8a88
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions src/CsvHelper/CsvReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ protected virtual void ValidateHeader(ClassMap map, List<InvalidHeader> invalidH
continue;
}

var index = GetFieldIndex(memberMap.Data.Names.ToArray(), memberMap.Data.NameIndex, true);
var index = GetFieldIndex(memberMap.Data.Names, memberMap.Data.NameIndex, true);
var isValid = index != -1 || memberMap.Data.IsOptional;
if (!isValid)
{
Expand Down Expand Up @@ -1209,12 +1209,7 @@ public virtual int GetFieldIndex(string name, int index = 0, bool isTryGet = fal
}

/// <inheritdoc/>
public virtual int GetFieldIndex(string[] names, int index = 0, bool isTryGet = false, bool isOptional = false)
{
return GetFieldIndex((IEnumerable<string>)names, index, isTryGet, isOptional);
}

internal int GetFieldIndex(IEnumerable<string> names, int index = 0, bool isTryGet = false, bool isOptional = false)
public virtual int GetFieldIndex(IEnumerable<string> names, int index = 0, bool isTryGet = false, bool isOptional = false)
{
if (names == null)
{
Expand All @@ -1241,7 +1236,7 @@ internal int GetFieldIndex(IEnumerable<string> names, int index = 0, bool isTryG

// Check all possible names for this field.
string name = null;
int i = 0;
var i = 0;
foreach (var n in names)
{
// Get the list of indexes for this name.
Expand All @@ -1252,6 +1247,7 @@ internal int GetFieldIndex(IEnumerable<string> names, int index = 0, bool isTryG
name = fieldName;
break;
}

i++;
}

Expand All @@ -1261,7 +1257,7 @@ internal int GetFieldIndex(IEnumerable<string> names, int index = 0, bool isTryG
// It doesn't exist. The field is missing.
if (!isTryGet && !isOptional)
{
var args = new MissingFieldFoundArgs(names as string[] ?? names.ToArray(), index, context);
var args = new MissingFieldFoundArgs(names.ToArray(), index, context);
missingFieldFound?.Invoke(args);
}

Expand Down

0 comments on commit 5ef8a88

Please sign in to comment.