Remove this 'return' statement or make it conditional

Question

I'm using a code analysis software called SonarQube and it's giving me this error message saying that I should remove the return statement or make it conditional

I'm thinking about suppressing the message but not entirely sure yet.

protected static SubAccount GetSubAccountByProductCode(Holding acordHolding, string productCode, string optionType)
{
    var OptionTypeElement = ACORDUtil.CreateACORDElement("OptionType");
    const string subAccountPrefix = "SubAccount";
    var OlifeExtensions = new List<XmlElement>();

    if (string.IsNullOrEmpty(optionType))
    {
        OptionTypeElement.InnerText = "V";
    }
    else
    {
        OptionTypeElement.InnerText = optionType;
    }
    OlifeExtensions.Add(OptionTypeElement);
    foreach (var acordSubAccount in acordHolding.Investment.SubAccount.Where(sa => sa.ProductCode.Equals(productCode)))
    {
        acordSubAccount.OLifEExtension.Add(ACORDUtil.CreateOLifEExtension(OlifeExtensions));
        return acordSubAccount;
    }

    //sub account not found, create one for this product symbol.
    var newSubAccount = new SubAccount();
    newSubAccount.id = string.Format("{0}-{1}", subAccountPrefix, productCode);
    newSubAccount.ProductCode = productCode;
    acordHolding.Investment.SubAccount.Add(newSubAccount);

    var oLifeExt = ACORDUtil.CreateOLifEExtension(OlifeExtensions);
    newSubAccount.OLifEExtension.Add(oLifeExt);
    return newSubAccount;
}

Make sonarqube not throw out an error message.

Answer 1

Well, it'll only happen for one item, so you could make it simpler and more obvious:

var acordSubAccount = acordHolding.Investment.SubAccount.FirstOrDefault(
    sa => sa.ProductCode.Equals(productCode)); // possibly use == instead of .Equals?
if (acordSubAccount != null)
{
    acordSubAccount.OLifEExtension.Add(ACORDUtil.CreateOLifEExtension(OlifeExtensions));
    return acordSubAccount;
}

Answer 2

It's because you have a return in your ForEach loop.

It reads like you expect exactly one item to match, therefore perhaps change it to use SingleOrDefault. This will return exactly one element matching the condition, or throw an exception if there are multiple matching.

var acordSubAccount = acordHolding.Investment.SubAccount.SingleOrDefault(
    sa => sa.ProductCode.Equals(productCode));
if (acordSubAccount != null)
{
    acordSubAccount.OLifEExtension.Add(ACORDUtil.CreateOLifEExtension(OlifeExtensions));
    return acordSubAccount;
}