Fix string to objectId mapping error when using query method.

[grwang91]

• You have read the Spring Data contribution guidelines.
• You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
• You submit test cases (unit or integration tests) that back your changes.
• You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

Fixed objectId conversion issue.
Merged common codes into method.

Resolves: #4490

[christophstrobl]

@grwang91 thank you for the the PR!

[christophstrobl]

I'm curious if we need to explicitly check on the presence of certain keys here. What might also work would be to check if the key is a keyword and then call convertIdField with the value.

private Object convertIdField(Field documentField, Object source) {

    // ... logic for $in,...

    for(Entry<String,Object> entry : valueDbo.entrySet()) {
        if(isKeyword(entry.getKey())) {
            resultDbo.put(entry.getKey(), convertIdField(documentField, entry.getValue()));
        } else {
            resultDbo.put(entry.getKey(), getMappedValue(documentField, entry.getValue()));
        }
    }

[grwang91]

Thanks for suggestion. I will apply it!

[christophstrobl]

I think I'd like to see the changes contained in #4517 go in first and then bring in additional logic for handling the id conversion from this PR.

[grwang91]

I think I'd like to see the changes contained in #4517 go in first and then bring in additional logic for handling the id conversion from this PR.

Do you mean applying this PR after merging #4517 to main branch?

[mp911de]

Thank you for your contribution. That's merged and polished now.